summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-02-11 09:55:08 +0100
committerGitHub <noreply@github.com>2022-02-11 09:55:08 +0100
commit7a7a695b27eb80b6f45723376ca03dca344d1fb5 (patch)
tree1b194eb157072e866f338d105b04623aed74eca3
parent0a4f8729d2653f9d75e64537bf45c34062565979 (diff)
parent65426f831fdf1288531bdc17f86747c81dd7978c (diff)
Merge pull request #57961 from bruvzg/fix_win_drap_drop
[Windows] Fix drag-and-drop.
-rw-r--r--platform/windows/display_server_windows.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
index 20268b3f6a..36c87f2683 100644
--- a/platform/windows/display_server_windows.cpp
+++ b/platform/windows/display_server_windows.cpp
@@ -1023,6 +1023,7 @@ void DisplayServerWindows::_get_window_style(bool p_main_window, bool p_fullscre
r_style_ex |= WS_EX_TOPMOST | WS_EX_NOACTIVATE;
}
r_style |= WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+ r_style_ex |= WS_EX_ACCEPTFILES;
}
void DisplayServerWindows::_update_window_style(WindowID p_window, bool p_repaint) {
@@ -1099,10 +1100,10 @@ void DisplayServerWindows::window_set_mode(WindowMode p_mode, WindowID p_window)
if (p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
wd.multiwindow_fs = false;
- _update_window_style(false);
+ _update_window_style(p_window, false);
} else {
wd.multiwindow_fs = true;
- _update_window_style(false);
+ _update_window_style(p_window, false);
}
if ((p_mode == WINDOW_MODE_FULLSCREEN || p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) && !wd.fullscreen) {
@@ -1123,7 +1124,7 @@ void DisplayServerWindows::window_set_mode(WindowMode p_mode, WindowID p_window)
wd.maximized = false;
wd.minimized = false;
- _update_window_style(false);
+ _update_window_style(p_window, false);
MoveWindow(wd.hWnd, pos.x, pos.y, size.width, size.height, TRUE);