summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcaptainwasabi <github@dougwalker.us>2016-05-20 07:56:42 -0400
committerRémi Verschelde <remi@verschelde.fr>2016-05-20 13:56:42 +0200
commit4b80895082655084742480a6c42ccfae01cc336e (patch)
treedddea53c75de470d9358beda0507454b9928323b
parent5e0f0a962adddfc85957400b007b6b0c08160057 (diff)
Fix for tooltip blinking (#4713)
Moved where active tooltips are canceled to wait until the mouse actually moves off the control.
-rw-r--r--scene/main/viewport.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index c9f61beba7..2a057fc424 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1841,6 +1841,8 @@ void Viewport::_gui_input_event(InputEvent p_event) {
if (gui.mouse_over)
gui.mouse_over->notification(Control::NOTIFICATION_MOUSE_EXIT);
+
+ _gui_cancel_tooltip();
if (over)
over->notification(Control::NOTIFICATION_MOUSE_ENTER);
@@ -1849,8 +1851,6 @@ void Viewport::_gui_input_event(InputEvent p_event) {
gui.mouse_over=over;
- _gui_cancel_tooltip();
-
if (gui.drag_preview) {
gui.drag_preview->set_pos(mpos);
}