asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Update variable name to reflect usage

Browse source
This commit is contained in:
Markus Sauermann 2022-02-19 09:19:15 +01:00
parent 417698c202
commit 27aab7f7ca
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scene/main/viewport.cpp
View file

@ -497,16 +497,16 @@ void Viewport::_notification(int p_what) {
} break;
case NOTIFICATION_VP_MOUSE_ENTER: {
gui.mouse_in_window = true;
gui.mouse_in_viewport = true;
} break;
case NOTIFICATION_VP_MOUSE_EXIT: {
gui.mouse_in_window = false;
gui.mouse_in_viewport = false;
_drop_physics_mouseover();
_drop_mouse_over();
// When the mouse exits the window, we want to end mouse_over, but
// When the mouse exits the viewport, we want to end mouse_over, but
// not mouse_focus, because, for example, we want to continue
// dragging a scrollbar even if the mouse has left the window.
// dragging a scrollbar even if the mouse has left the viewport.
} break;
case NOTIFICATION_WM_WINDOW_FOCUS_OUT: {
@ -1683,7 +1683,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
Control *over = nullptr;
if (gui.mouse_focus) {
over = gui.mouse_focus;
} else if (gui.mouse_in_window) {
} else if (gui.mouse_in_viewport) {
over = gui_find_control(mpos);
}

2
scene/main/viewport.h
View file

@ -335,7 +335,7 @@ private:
// info used when this is a window
bool forced_mouse_focus = false; //used for menu buttons
bool mouse_in_window = true;
bool mouse_in_viewport = true;
bool key_event_accepted = false;
Control *mouse_focus = nullptr;
Control *last_mouse_focus = nullptr;