diff options
| author | Jaroslaw Filiochowski <jarfil@gmail.com> | 2016-07-19 06:27:12 +0200 |
|---|---|---|
| committer | Jaroslaw Filiochowski <jarfil@gmail.com> | 2016-07-19 07:07:53 +0200 |
| commit | be560a750c363355ad077331bf6bdbc62c6b2762 (patch) | |
| tree | f61ec4090a93d37a248cde80946ed852e4e0bf99 | |
| parent | 1e7b9c509f02dd641f10fe50d24bb19c165078d7 (diff) | |
Hide tooltip if new mouse position's tooltip is empty
| -rw-r--r-- | scene/main/viewport.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 9d2b0cfccf..cf84f8f425 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -2009,11 +2009,17 @@ void Viewport::_gui_input_event(InputEvent p_event) { bool is_tooltip_shown = false; - if (can_tooltip && gui.tooltip_popup) { - String tooltip = over->get_tooltip(gui.tooltip->get_global_transform().xform_inv(mpos)); - - if (gui.tooltip_popup && tooltip == gui.tooltip_label->get_text()) - is_tooltip_shown = true; + if (gui.tooltip_popup) { + if (can_tooltip) { + String tooltip = over->get_tooltip(gui.tooltip->get_global_transform().xform_inv(mpos)); + + if (tooltip.length() == 0) + _gui_cancel_tooltip(); + else if (tooltip == gui.tooltip_label->get_text()) + is_tooltip_shown = true; + } + else + _gui_cancel_tooltip(); } if (can_tooltip && !is_tooltip_shown) { |