asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #34838 from volzhs/calculate-label-size

Browse source 
Fix calculating label size
This commit is contained in:
Rémi Verschelde 2020-01-05 18:17:49 +01:00 committed by GitHub
commit 82622d0e41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scene/gui/label.cpp
View file

@ -313,8 +313,8 @@ Size2 Label::get_minimum_size() const {
int Label::get_longest_line_width() const { int Label::get_longest_line_width() const {
Ref<Font> font = get_font("font"); Ref<Font> font = get_font("font");
int max_line_width = 0; real_t max_line_width = 0;
int line_width = 0; real_t line_width = 0;
for (int i = 0; i < xl_text.size(); i++) { for (int i = 0; i < xl_text.size(); i++) {
@ -332,8 +332,7 @@ int Label::get_longest_line_width() const {
} }
} else { } else {
// ceiling to ensure autowrapping does not cut text real_t char_width = font->get_char_size(current, xl_text[i + 1]).width;
int char_width = Math::ceil(font->get_char_size(current, xl_text[i + 1]).width);
line_width += char_width; line_width += char_width;
} }
} }
@ -341,7 +340,8 @@ int Label::get_longest_line_width() const {
if (line_width > max_line_width) if (line_width > max_line_width)
max_line_width = line_width; max_line_width = line_width;
return max_line_width; // ceiling to ensure autowrapping does not cut text
return Math::ceil(max_line_width);
} }
int Label::get_line_count() const { int Label::get_line_count() const {
@ -388,7 +388,7 @@ void Label::regenerate_word_cache() {
Ref<Font> font = get_font("font"); Ref<Font> font = get_font("font");
int current_word_size = 0; real_t current_word_size = 0;
int word_pos = 0; int word_pos = 0;
int line_width = 0; int line_width = 0;
int space_count = 0; int space_count = 0;
@ -413,7 +413,7 @@ void Label::regenerate_word_cache() {
bool separatable = (current >= 0x2E08 && current <= 0xFAFF) || (current >= 0xFE30 && current <= 0xFE4F); bool separatable = (current >= 0x2E08 && current <= 0xFAFF) || (current >= 0xFE30 && current <= 0xFE4F);
//current>=33 && (current < 65||current >90) && (current<97||current>122) && (current<48||current>57); //current>=33 && (current < 65||current >90) && (current<97||current>122) && (current<48||current>57);
bool insert_newline = false; bool insert_newline = false;
int char_width = 0; real_t char_width = 0;
if (current < 33) { if (current < 33) {
@ -455,9 +455,9 @@ void Label::regenerate_word_cache() {
word_pos = i; word_pos = i;
} }
// ceiling to ensure autowrapping does not cut text // ceiling to ensure autowrapping does not cut text
char_width = Math::ceil(font->get_char_size(current, xl_text[i + 1]).width); char_width = font->get_char_size(current, xl_text[i + 1]).width;
current_word_size += char_width; current_word_size += char_width;
line_width += char_width; line_width += Math::ceil(char_width);
total_char_cache++; total_char_cache++;
// allow autowrap to cut words when they exceed line width // allow autowrap to cut words when they exceed line width