From 08fa7a0ff12bebe238002415975d1710b66b23cc Mon Sep 17 00:00:00 2001 From: captainwasabi Date: Fri, 20 May 2016 07:56:42 -0400 Subject: [PATCH] Fix for tooltip blinking (#4713) Moved where active tooltips are canceled to wait until the mouse actually moves off the control. (cherry picked from commit 4b80895082655084742480a6c42ccfae01cc336e) --- scene/main/viewport.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 5017ae61ff6..f81523df521 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1818,6 +1818,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); @@ -1826,8 +1828,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); }