Merge pull request #14484 from Zylann/fix_mouse_focus_button_release

Fix mouse button release not sent to gui_input if it's different from the button that gave focus

Merge pull request #14484 from Zylann/fix_mouse_focus_button_release
9079be9e · Rémi Verschelde · GitHub · 6b7bed98 · f52da158 · 9079be9e
Unverified Commit 9079be9e authored Dec 16, 2017 by Rémi Verschelde Committed by GitHub Dec 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

viewport.cpp scene/main/viewport.cpp +2 -1

No files found.
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1811,7 +1811,8 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 				_gui_call_input(gui.mouse_focus, mb);
 			}

-			if (mb->get_button_index() == gui.mouse_focus_button) {
+			if (mb->get_button_mask() == 0) {
+				// Last mouse button was released
 				gui.mouse_focus = NULL;
 				gui.mouse_focus_button = -1;
 			}