diff options
| author | Yuri Roubinsky <chaosus89@gmail.com> | 2021-01-06 14:58:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-06 14:58:15 +0300 |
| commit | 43fa911f2b3de4c20997c0aaa6d13ac905c4dc64 (patch) | |
| tree | dfd869708294d388d95494f5efbbb36899102353 /platform/windows/display_server_windows.h | |
| parent | 89a83a8af263ca9e997aa6d70b5b18c5b07e5fdb (diff) | |
| parent | d4939aa05fb16292458c0da3f0100b133465082b (diff) | |
Merge pull request #44948 from Chaosus/fix_popup_menus
Fix PopupMenu's which are not closed after a recent commit
Diffstat (limited to 'platform/windows/display_server_windows.h')
| -rw-r--r-- | platform/windows/display_server_windows.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/platform/windows/display_server_windows.h b/platform/windows/display_server_windows.h index 722854c538..4a3f91eb21 100644 --- a/platform/windows/display_server_windows.h +++ b/platform/windows/display_server_windows.h @@ -339,6 +339,14 @@ private: bool no_focus = false; bool window_has_focus = false; + // Used to transfer data between events using timer. + WPARAM saved_wparam; + LPARAM saved_lparam; + + // Timers. + uint32_t move_timer_id = 0U; + uint32_t focus_timer_id = 0U; + HANDLE wtctx; LOGCONTEXTW wtlc; int min_pressure; @@ -387,9 +395,6 @@ private: WindowID last_focused_window = INVALID_WINDOW_ID; - uint32_t move_timer_id = 0U; - uint32_t focus_timer_id = 0U; - HCURSOR hCursor; WNDPROC user_proc = nullptr; @@ -409,9 +414,6 @@ private: bool in_dispatch_input_event = false; bool console_visible = false; - WPARAM saved_wparam; - LPARAM saved_lparam; - WNDCLASSEXW wc; HCURSOR cursors[CURSOR_MAX] = { nullptr }; @@ -428,6 +430,7 @@ private: void _set_mouse_mode_impl(MouseMode p_mode); + void _process_activate_event(WindowID p_window_id, WPARAM wParam, LPARAM lParam); void _process_key_events(); static void _dispatch_input_events(const Ref<InputEvent> &p_event); |