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

Merge pull request #17612 from robfram/fix-richtextlabel-bbcode

Browse source 
Fix bad rendering of BBCode tables in `RichTextLabel`
This commit is contained in:
Rémi Verschelde 2018-03-23 10:22:33 +01:00 committed by GitHub
commit 5f0ea4ddcf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scene/gui/rich_text_label.cpp
View file

@ -125,6 +125,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
l.descent_caches.clear(); l.descent_caches.clear();
l.char_count = 0; l.char_count = 0;
l.minimum_width = 0; l.minimum_width = 0;
l.maximum_width = 0;
} }
int wofs = margin; int wofs = margin;
@ -200,7 +201,8 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
#define ENSURE_WIDTH(m_width) \ #define ENSURE_WIDTH(m_width) \
if (p_mode == PROCESS_CACHE) { \ if (p_mode == PROCESS_CACHE) { \
l.minimum_width = MAX(l.minimum_width, wofs + m_width); \ l.maximum_width = MAX(l.maximum_width, MIN(p_width, wofs + m_width)); \
l.minimum_width = MAX(l.minimum_width, m_width); \
} \ } \
if (wofs + m_width > p_width) { \ if (wofs + m_width > p_width) { \
if (p_mode == PROCESS_CACHE) { \ if (p_mode == PROCESS_CACHE) { \
@ -469,6 +471,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
//set minimums to zero //set minimums to zero
for (int i = 0; i < table->columns.size(); i++) { for (int i = 0; i < table->columns.size(); i++) {
table->columns[i].min_width = 0; table->columns[i].min_width = 0;
table->columns[i].max_width = 0;
table->columns[i].width = 0; table->columns[i].width = 0;
} }
//compute minimum width for each cell //compute minimum width for each cell
@ -486,6 +489,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
_process_line(frame, Point2(), ly, available_width, i, PROCESS_CACHE, cfont, Color()); _process_line(frame, Point2(), ly, available_width, i, PROCESS_CACHE, cfont, Color());
table->columns[column].min_width = MAX(table->columns[column].min_width, frame->lines[i].minimum_width); table->columns[column].min_width = MAX(table->columns[column].min_width, frame->lines[i].minimum_width);
table->columns[column].max_width = MAX(table->columns[column].max_width, frame->lines[i].maximum_width);
} }
idx++; idx++;
} }
@ -498,12 +502,13 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
for (int i = 0; i < table->columns.size(); i++) { for (int i = 0; i < table->columns.size(); i++) {
remaining_width -= table->columns[i].min_width; remaining_width -= table->columns[i].min_width;
if (table->columns[i].max_width > table->columns[i].min_width)
table->columns[i].expand = true;
if (table->columns[i].expand) if (table->columns[i].expand)
total_ratio += table->columns[i].expand_ratio; total_ratio += table->columns[i].expand_ratio;
} }
//assign actual widths //assign actual widths
for (int i = 0; i < table->columns.size(); i++) { for (int i = 0; i < table->columns.size(); i++) {
table->columns[i].width = table->columns[i].min_width; table->columns[i].width = table->columns[i].min_width;
if (table->columns[i].expand) if (table->columns[i].expand)
@ -1633,7 +1638,7 @@ Error RichTextLabel::append_bbcode(const String &p_bbcode) {
tag_stack.push_front(tag); tag_stack.push_front(tag);
} else if (tag.begins_with("cell=")) { } else if (tag.begins_with("cell=")) {
int ratio = tag.substr(6, tag.length()).to_int(); int ratio = tag.substr(5, tag.length()).to_int();
if (ratio < 1) if (ratio < 1)
ratio = 1; ratio = 1;
//use monospace font //use monospace font

2
scene/gui/rich_text_label.h
View file

@ -87,6 +87,7 @@ private:
int height_accum_cache; int height_accum_cache;
int char_count; int char_count;
int minimum_width; int minimum_width;
int maximum_width;
Line() { Line() {
from = NULL; from = NULL;
@ -199,6 +200,7 @@ private:
bool expand; bool expand;
int expand_ratio; int expand_ratio;
int min_width; int min_width;
int max_width;
int width; int width;
}; };