summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-02-07 13:58:35 +0100
committerGitHub <noreply@github.com>2022-02-07 13:58:35 +0100
commitbe1adf491a6b40642cba186167e6635efca37f99 (patch)
tree0c1ebebad8126a9d702c79c108b0926df158e2ee
parent1694626e03639cdf6879117e00772bdcc6bad594 (diff)
parent20fb34927d8a03c60c8fa9a3c58d0d582fd6aee9 (diff)
Merge pull request #57736 from TechnicalSoup/Patch-3
-rw-r--r--platform/windows/display_server_windows.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
index b340129a16..21ab9923a2 100644
--- a/platform/windows/display_server_windows.cpp
+++ b/platform/windows/display_server_windows.cpp
@@ -546,6 +546,15 @@ DisplayServer::WindowID DisplayServerWindows::create_sub_window(WindowMode p_mod
wd.no_focus = true;
}
+ // Inherit icons from MAIN_WINDOW for all sub windows.
+ HICON mainwindow_icon = (HICON)SendMessage(windows[MAIN_WINDOW_ID].hWnd, WM_GETICON, ICON_SMALL, 0);
+ if (mainwindow_icon) {
+ SendMessage(windows[window_id].hWnd, WM_SETICON, ICON_SMALL, (LPARAM)mainwindow_icon);
+ }
+ mainwindow_icon = (HICON)SendMessage(windows[MAIN_WINDOW_ID].hWnd, WM_GETICON, ICON_BIG, 0);
+ if (mainwindow_icon) {
+ SendMessage(windows[window_id].hWnd, WM_SETICON, ICON_BIG, (LPARAM)mainwindow_icon);
+ }
return window_id;
}