|
@@ -3930,7 +3930,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
|
|
|
}
|
|
|
mm->set_relative_screen_position(mm->get_relative());
|
|
|
|
|
|
- if ((windows[window_id].window_has_focus || windows[window_id].is_popup) && mm->get_relative() != Vector2()) {
|
|
|
+ if ((windows[window_id].window_focused || windows[window_id].is_popup) && mm->get_relative() != Vector2()) {
|
|
|
Input::get_singleton()->parse_input_event(mm);
|
|
|
}
|
|
|
}
|
|
@@ -3978,7 +3978,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
|
|
|
windows[window_id].last_pen_inverted = inverted;
|
|
|
|
|
|
// Don't calculate relative mouse movement if we don't have focus in CAPTURED mode.
|
|
|
- if (!windows[window_id].window_has_focus && mouse_mode == MOUSE_MODE_CAPTURED) {
|
|
|
+ if (!windows[window_id].window_focused && mouse_mode == MOUSE_MODE_CAPTURED) {
|
|
|
break;
|
|
|
}
|
|
|
|
|
@@ -4028,7 +4028,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
|
|
|
mm->set_relative_screen_position(mm->get_relative());
|
|
|
old_x = mm->get_position().x;
|
|
|
old_y = mm->get_position().y;
|
|
|
- if (windows[window_id].window_has_focus || window_get_active_popup() == window_id) {
|
|
|
+ if (windows[window_id].window_focused || window_get_active_popup() == window_id) {
|
|
|
Input::get_singleton()->parse_input_event(mm);
|
|
|
}
|
|
|
}
|
|
@@ -4114,7 +4114,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
|
|
|
}
|
|
|
|
|
|
// Don't calculate relative mouse movement if we don't have focus in CAPTURED mode.
|
|
|
- if (!windows[window_id].window_has_focus && mouse_mode == MOUSE_MODE_CAPTURED) {
|
|
|
+ if (!windows[window_id].window_focused && mouse_mode == MOUSE_MODE_CAPTURED) {
|
|
|
break;
|
|
|
}
|
|
|
|
|
@@ -4177,7 +4177,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
|
|
|
mm->set_relative_screen_position(mm->get_relative());
|
|
|
old_x = mm->get_position().x;
|
|
|
old_y = mm->get_position().y;
|
|
|
- if (windows[window_id].window_has_focus || window_get_active_popup() == window_id) {
|
|
|
+ if (windows[window_id].window_focused || window_get_active_popup() == window_id) {
|
|
|
Input::get_singleton()->parse_input_event(mm);
|
|
|
}
|
|
|
|
|
@@ -4229,7 +4229,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
|
|
|
}
|
|
|
|
|
|
// Don't calculate relative mouse movement if we don't have focus in CAPTURED mode.
|
|
|
- if (!windows[window_id].window_has_focus && mouse_mode == MOUSE_MODE_CAPTURED) {
|
|
|
+ if (!windows[window_id].window_focused && mouse_mode == MOUSE_MODE_CAPTURED) {
|
|
|
break;
|
|
|
}
|
|
|
|
|
@@ -4725,7 +4725,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
|
|
|
} break;
|
|
|
case WM_SETCURSOR: {
|
|
|
if (LOWORD(lParam) == HTCLIENT) {
|
|
|
- if (windows[window_id].window_has_focus && (mouse_mode == MOUSE_MODE_HIDDEN || mouse_mode == MOUSE_MODE_CAPTURED || mouse_mode == MOUSE_MODE_CONFINED_HIDDEN)) {
|
|
|
+ if (windows[window_id].window_focused && (mouse_mode == MOUSE_MODE_HIDDEN || mouse_mode == MOUSE_MODE_CAPTURED || mouse_mode == MOUSE_MODE_CONFINED_HIDDEN)) {
|
|
|
// Hide the cursor.
|
|
|
if (hCursor == nullptr) {
|
|
|
hCursor = SetCursor(nullptr);
|