Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-04 05:36:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 9abfe97937 into cca7589486

Browse Source
This commit is contained in:
Ioannis Tsakpinis 2015-09-07 13:25:47 +00:00
commit dcc754be99
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/win32_window.c
View File

@ -722,8 +722,18 @@ static void destroyWindow(_GLFWwindow* window)
if (window->win32.handle) if (window->win32.handle)
{ {
HICON iconBig = (HICON)SendMessage(window->win32.handle, WM_GETICON, ICON_BIG, 0);
HICON iconSmall = (HICON)SendMessage(window->win32.handle, WM_GETICON, ICON_SMALL, 0);
DestroyWindow(window->win32.handle); DestroyWindow(window->win32.handle);
window->win32.handle = NULL; window->win32.handle = NULL;
if (iconBig) // Destroy icon(s)
{
DestroyIcon(iconBig);
if (iconSmall != iconBig)
DestroyIcon(iconSmall);
}
} }
} }
@ -733,7 +743,6 @@ static HICON createIcon(GLFWimage* image)
{ {
BITMAPV5HEADER header; BITMAPV5HEADER header;
HDC hdc; HDC hdc;
unsigned char* BGRAData;
HBITMAP bitmap, mask; HBITMAP bitmap, mask;
ICONINFO iconinfo; ICONINFO iconinfo;
HICON icon; HICON icon;
@ -743,7 +752,7 @@ static HICON createIcon(GLFWimage* image)
// fill in BITMAPV5HEADER to pass to CreateDIBSection // fill in BITMAPV5HEADER to pass to CreateDIBSection
header.bV5Size = sizeof(header); header.bV5Size = sizeof(header);
header.bV5Width = image->width; header.bV5Width = image->width;
header.bV5Height = image->height; header.bV5Height = -image->height;
header.bV5Planes = 1; header.bV5Planes = 1;
header.bV5BitCount = 32; header.bV5BitCount = 32;
header.bV5Compression = BI_BITFIELDS; header.bV5Compression = BI_BITFIELDS;
@ -757,27 +766,18 @@ static HICON createIcon(GLFWimage* image)
bitmap = CreateDIBSection(hdc, (BITMAPINFO*) &header, DIB_RGB_COLORS, (void**) &dibData, NULL, 0); bitmap = CreateDIBSection(hdc, (BITMAPINFO*) &header, DIB_RGB_COLORS, (void**) &dibData, NULL, 0);
ReleaseDC(NULL, hdc); ReleaseDC(NULL, hdc);
// first we need to convert RGBA to BGRA (yay Windows!)
// we also need to convert lines, because Windows wants bottom-to-top RGBA
BGRAData = calloc(1, image->width * image->height * 4);
for (i = 0; i < image->width * image->height; i++) for (i = 0; i < image->width * image->height; i++)
{ {
unsigned char* dst = BGRAData + 4 * i; unsigned char* dst = dibData + 4 * i;
unsigned char *src = image->pixels + 4 * i; unsigned char *src = image->pixels + 4 * i;
// convert RGBA to BGRA
dst[0] = src[2]; // copy blue channel dst[0] = src[2]; // copy blue channel
dst[1] = src[1]; // copy green channel dst[1] = src[1]; // copy green channel
dst[2] = src[0]; // copy red channel dst[2] = src[0]; // copy red channel
dst[3] = src[3]; // copy alpha channel dst[3] = src[3]; // copy alpha channel
} }
// copy the BGRA data into dibData
memcpy(dibData, BGRAData, image->width * image->height * 4);
// free the BGRA data
free(BGRAData);
// create a mask that we don't use (but needed for iconinfo) // create a mask that we don't use (but needed for iconinfo)
mask = CreateBitmap(image->width, image->height, 1, 1, NULL); mask = CreateBitmap(image->width, image->height, 1, 1, NULL);
@ -1050,14 +1050,22 @@ void _glfwPlatformGetWindowFrameSize(_GLFWwindow* window,
void _glfwPlatformSetWindowIcons(_GLFWwindow* window, GLFWimage* icons, int count) void _glfwPlatformSetWindowIcons(_GLFWwindow* window, GLFWimage* icons, int count)
{ {
GLFWimage* normalicon; GLFWimage* imgBig;
GLFWimage* smallicon; GLFWimage* imgSmall;
normalicon = bestFit(icons, count, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON)); imgBig = bestFit(icons, count, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON));
smallicon = bestFit(icons, count, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON)); imgSmall = bestFit(icons, count, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON));
SendMessage(window->win32.handle, WM_SETICON, ICON_BIG, (LPARAM) createIcon(normalicon)); HICON icon = createIcon(imgBig);
SendMessage(window->win32.handle, WM_SETICON, ICON_SMALL, (LPARAM) createIcon(smallicon)); HICON iconBig = (HICON)SendMessage(window->win32.handle, WM_SETICON, ICON_BIG, (LPARAM) icon);
HICON iconSmall = (HICON)SendMessage(window->win32.handle, WM_SETICON, ICON_SMALL, (LPARAM) (imgSmall == imgBig ? icon : createIcon(imgSmall)));
if (iconBig) // Destroy previous icon(s)
{
DestroyIcon(iconBig);
if (iconSmall != iconBig)
DestroyIcon(iconSmall);
}
} }
void _glfwPlatformIconifyWindow(_GLFWwindow* window) void _glfwPlatformIconifyWindow(_GLFWwindow* window)