notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for missing icon on XP.

Browse source 
Moved the call to seticon() and the underlying SDL_WM_SetIcon() to
_before_ the first call of SDL_SetVideoMode() like it says in the docs.

Fix for loss of icon transparency on win32.
Discovered that using a NULL mask in the call to SDL_WM_SetIcon() restored
the icon transparency.
This commit is contained in:
John Popplewell 2004-09-26 01:55:04 +00:00
parent 7c9495324e
commit 6e45d58cd3
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/tuxpaint.c
View file

@ -4994,6 +4994,11 @@ void setup(int argc, char * argv[])
#endif #endif
/* Set window icon and caption: */
seticon();
SDL_WM_SetCaption("Tux Paint", "Tux Paint");
/* Open Window: */ /* Open Window: */
if (fullscreen) if (fullscreen)
@ -5101,12 +5106,6 @@ void setup(int argc, char * argv[])
/* Set window icon and caption: */
seticon();
SDL_WM_SetCaption("Tux Paint", "Tux Paint");
/* Create drawing canvas: */ /* Create drawing canvas: */
canvas = SDL_CreateRGBSurface(screen->flags, canvas = SDL_CreateRGBSurface(screen->flags,
@ -5716,7 +5715,6 @@ void seticon(void)
Uint8 * mask; Uint8 * mask;
SDL_Surface * icon; SDL_Surface * icon;
/* Load icon into a surface: */ /* Load icon into a surface: */
#ifndef WIN32 #ifndef WIN32
@ -5735,21 +5733,21 @@ void seticon(void)
} }
#ifndef WIN32
/* Create mask: */ /* Create mask: */
masklen = (((icon -> w) + 7) / 8) * (icon -> h); masklen = (((icon -> w) + 7) / 8) * (icon -> h);
mask = malloc(masklen * sizeof(Uint8)); mask = malloc(masklen * sizeof(Uint8));
memset(mask, 0xFF, masklen); memset(mask, 0xFF, masklen);
/* Set icon: */ /* Set icon: */
SDL_WM_SetIcon(icon, mask); SDL_WM_SetIcon(icon, mask);
/* Free icon surface & mask: */ /* Free icon surface & mask: */
free(mask); free(mask);
#else
/* Set icon: */
SDL_WM_SetIcon(icon, NULL);
#endif
SDL_FreeSurface(icon); SDL_FreeSurface(icon);