godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Windows] Save and re-apply window icon when changing window style.

Browse Source 
(cherry picked from commit b268c4b4bc)
This commit is contained in:
bruvzg 2022-05-10 11:12:04 +03:00 committed by Rémi Verschelde
parent b66f94d2ff
commit 2d3f5855c6
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
platform/windows/os_windows.cpp
View File

@ -2312,6 +2312,10 @@ void OS_Windows::_update_window_style(bool p_repaint, bool p_maximized) {
} }
} }
if (icon.is_valid()) {
set_icon(icon);
}
SetWindowPos(hWnd, video_mode.always_on_top ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE); SetWindowPos(hWnd, video_mode.always_on_top ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE);
if (p_repaint) { if (p_repaint) {
@ -3040,9 +3044,12 @@ void OS_Windows::set_native_icon(const String &p_filename) {
void OS_Windows::set_icon(const Ref<Image> &p_icon) { void OS_Windows::set_icon(const Ref<Image> &p_icon) {
ERR_FAIL_COND(!p_icon.is_valid()); ERR_FAIL_COND(!p_icon.is_valid());
Ref<Image> icon = p_icon->duplicate(); if (icon != p_icon) {
if (icon->get_format() != Image::FORMAT_RGBA8) icon = p_icon->duplicate();
icon->convert(Image::FORMAT_RGBA8); if (icon->get_format() != Image::FORMAT_RGBA8) {
icon->convert(Image::FORMAT_RGBA8);
}
}
int w = icon->get_width(); int w = icon->get_width();
int h = icon->get_height(); int h = icon->get_height();

2
platform/windows/os_windows.h
View File

@ -318,6 +318,8 @@ class OS_Windows : public OS {
uint32_t move_timer_id; uint32_t move_timer_id;
Ref<Image> icon;
HCURSOR hCursor; HCURSOR hCursor;
Size2 min_size; Size2 min_size;