Mirrors_UI_SDK/GacUI
1
0
Fork 0
mirror of https://github.com/vczh-libraries/Release.git synced 2026-05-18 16:19:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Zihan Chen
2019-01-16 03:21:31 -08:00
parent a67fc2929a
commit b6dc93fc31
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Import/GacUIWindows.cpp
+24 -14
View File
@@ -9073,13 +9073,8 @@ WindowsForm
void SetIcon(Ptr<GuiImageData> icon)
{
if (replacementHIcon != NULL)
{
DestroyIcon(replacementHIcon);
replacementHIcon = NULL;
}
replacementIcon = icon;
HICON newReplacementHIcon = NULL;
if (replacementIcon && replacementIcon->GetImage())
{
stream::MemoryStream memoryStream;
@@ -9087,8 +9082,8 @@ WindowsForm
replacementIcon->GetImage()->SaveToStream(memoryStream, INativeImage::Icon);
if (memoryStream.Size() > 0)
{
replacementHIcon = CreateIconFromResource((PBYTE)memoryStream.GetInternalBuffer(), (DWORD)memoryStream.Size(), TRUE, 0x00030000);
if (replacementHIcon != NULL)
newReplacementHIcon = CreateIconFromResource((PBYTE)memoryStream.GetInternalBuffer(), (DWORD)memoryStream.Size(), TRUE, 0x00030000);
if (newReplacementHIcon != NULL)
{
goto SKIP;
}
@@ -9161,7 +9156,7 @@ WindowsForm
if (himl != NULL)
{
int addResult = ImageList_Add(himl, hBitmap, NULL);
replacementHIcon = ImageList_GetIcon(himl, 0, ILD_NORMAL);
newReplacementHIcon = ImageList_GetIcon(himl, 0, ILD_NORMAL);
ImageList_Destroy(himl);
}
DeleteObject(hBitmap);
@@ -9171,13 +9166,28 @@ WindowsForm
}
SKIP:
SendMessage(handle, WM_SETICON, ICON_BIG, (LPARAM)replacementHIcon);
SendMessage(handle, WM_SETICON, ICON_SMALL, (LPARAM)replacementHIcon);
if (this == GetCurrentController()->WindowService()->GetMainWindow())
{
SendMessage(GetWindow(handle, GW_OWNER), WM_SETICON, ICON_BIG, (LPARAM)replacementHIcon);
SendMessage(GetWindow(handle, GW_OWNER), WM_SETICON, ICON_SMALL, (LPARAM)replacementHIcon);
HICON hAppIcon = newReplacementHIcon;
if (hAppIcon == NULL) hAppIcon = CreateWindowDefaultIcon();
if (hAppIcon == NULL) hAppIcon = (HICON)LoadImage(NULL, IDI_APPLICATION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_SHARED);
bool isVisible = IsVisible();
if (isVisible) SendMessage(handle, WM_SETREDRAW, (WPARAM)FALSE, NULL);
SendMessage(handle, WM_SETICON, ICON_BIG, (LPARAM)newReplacementHIcon);
SendMessage(handle, WM_SETICON, ICON_SMALL, (LPARAM)newReplacementHIcon);
if (isVisible) SendMessage(handle, WM_SETREDRAW, (WPARAM)TRUE, NULL);
if (this == GetCurrentController()->WindowService()->GetMainWindow())
{
SendMessage(GetWindow(handle, GW_OWNER), WM_SETICON, ICON_BIG, (LPARAM)hAppIcon);
SendMessage(GetWindow(handle, GW_OWNER), WM_SETICON, ICON_SMALL, (LPARAM)hAppIcon);
}
}
if (replacementHIcon != NULL)
{
DestroyIcon(replacementHIcon);
}
replacementHIcon = newReplacementHIcon;
}
WindowSizeState GetSizeState()