summaryrefslogtreecommitdiff
path: root/scene/main
diff options
context:
space:
mode:
authorNoshyaar <poommetee@protonmail.com>2017-12-25 08:33:42 +0700
committerGitHub <noreply@github.com>2017-12-25 08:33:42 +0700
commit1348b087e634ffa9eaac21d83ae44bd1fcb06527 (patch)
treebbe5462f3507793fe728cfcf9afa30e22c5c5174 /scene/main
parentc9c1bc7a739e46cc6d67af26e99b7d337911595f (diff)
parentfcba654bb8bdf4e39b37628a1d46ed3e2b74692a (diff)
Merge pull request #14753 from NathanWarden/mouse_button_fix
Fixed a bug where mouse button focus breaks when using multiple buttons at once.
Diffstat (limited to 'scene/main')
-rw-r--r--scene/main/viewport.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 8f431389d8..72d910f559 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1640,7 +1640,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
if (mb->is_pressed()) {
Size2 pos = mpos;
- if (gui.mouse_focus && mb->get_button_index() != gui.mouse_focus_button) {
+ if (gui.mouse_focus && mb->get_button_index() != gui.mouse_focus_button && mb->get_button_index() == BUTTON_LEFT) {
//do not steal mouse focus and stuff