maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use correct meta item in rich text.

Browse source 
Prevent incorrect static cast and unnecesarry meta_hover_ended/started
events.
This commit is contained in:
Kārlis Seņko 2019-02-22 00:23:05 +02:00
parent 30a4723d9c
commit 05f5774592
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scene/gui/rich_text_label.cpp
View file

@ -1133,12 +1133,13 @@ void RichTextLabel::_gui_input(Ref<InputEvent> p_event) {
}
Variant meta;
if (item && !outside && _find_meta(item, &meta)) {
if (meta_hovering != item) {
ItemMeta *item_meta;
if (item && !outside && _find_meta(item, &meta, &item_meta)) {
if (meta_hovering != item_meta) {
if (meta_hovering) {
emit_signal("meta_hover_ended", current_meta);
}
meta_hovering = static_cast<ItemMeta *>(item);
meta_hovering = item_meta;
current_meta = meta;
emit_signal("meta_hover_started", meta);
}
@ -1269,7 +1270,7 @@ bool RichTextLabel::_find_strikethrough(Item *p_item) {
return false;
}
bool RichTextLabel::_find_meta(Item *p_item, Variant *r_meta) {
bool RichTextLabel::_find_meta(Item *p_item, Variant *r_meta, ItemMeta **r_item) {
Item *item = p_item;
@ -1280,6 +1281,8 @@ bool RichTextLabel::_find_meta(Item *p_item, Variant *r_meta) {
ItemMeta *meta = static_cast<ItemMeta *>(item);
if (r_meta)
*r_meta = meta->meta;
if (r_item)
*r_item = meta;
return true;
}

2
scene/gui/rich_text_label.h
View file

@ -285,7 +285,7 @@ private:
Color _find_color(Item *p_item, const Color &p_default_color);
bool _find_underline(Item *p_item);
bool _find_strikethrough(Item *p_item);
bool _find_meta(Item *p_item, Variant *r_meta);
bool _find_meta(Item *p_item, Variant *r_meta, ItemMeta **r_item = NULL);
void _update_scroll();
void _scroll_changed(double);