summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-11-06 09:44:31 +0100
committerGitHub <noreply@github.com>2017-11-06 09:44:31 +0100
commit386ec5d9549bb0ee922358ead86ebc7ad478b910 (patch)
treebf94f19877e162aed34e81e208237da939c8e803
parentd4e37ef198ab74ed9a42127601c374f43dac12b6 (diff)
parenta7304b0c54681501e1e83a822410361368856964 (diff)
Merge pull request #12653 from poke1024/fixdocsclick
Fix selection and clicks on text in tables in RichTextLabel
-rw-r--r--scene/gui/rich_text_label.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index 65a8350bd3..798acb9d52 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -526,6 +526,9 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
nonblank_line_count += _process_line(frame, p_ofs + offset + draw_ofs + Vector2(0, yofs), ly, table->columns[column].width, i, PROCESS_DRAW, cfont, ccolor);
} else if (p_mode == PROCESS_POINTER) {
_process_line(frame, p_ofs + offset + draw_ofs + Vector2(0, yofs), ly, table->columns[column].width, i, PROCESS_POINTER, cfont, ccolor, p_click_pos, r_click_item, r_click_char, r_outside);
+ if (r_click_item && *r_click_item) {
+ RETURN; // exit early
+ }
}
}