fix incorrect window title and lost alpha in window icon
This commit is contained in:
@@ -588,7 +588,10 @@ void mySDL_WM_SetIcon( CString sIconFile )
|
|||||||
}
|
}
|
||||||
|
|
||||||
SDL_Surface *srf = IMG_Load(sIconFile);
|
SDL_Surface *srf = IMG_Load(sIconFile);
|
||||||
SDL_SetColorKey( srf, SDL_SRCCOLORKEY, SDL_MapRGB(srf->format, 0xFF, 0, 0xFF));
|
|
||||||
|
// Why is this needed? It's goofing up paletted images
|
||||||
|
// that use a color key other than pink. -Chris
|
||||||
|
// SDL_SetColorKey( srf, SDL_SRCCOLORKEY, SDL_MapRGB(srf->format, 0xFF, 0, 0xFF));
|
||||||
|
|
||||||
/* Windows icons are 32x32 and SDL can't resize them for us, which
|
/* Windows icons are 32x32 and SDL can't resize them for us, which
|
||||||
* causes mask corruption. (Actually, the above icon *is* 32x32;
|
* causes mask corruption. (Actually, the above icon *is* 32x32;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ LoadingWindow_SDL::LoadingWindow_SDL()
|
|||||||
RageException::Throw( "Couldn't initialize SDL: %s\n", SDL_GetError() );
|
RageException::Throw( "Couldn't initialize SDL: %s\n", SDL_GetError() );
|
||||||
|
|
||||||
/* Set window title and icon */
|
/* Set window title and icon */
|
||||||
SDL_WM_SetCaption("StepMania", "StepMania");
|
SDL_WM_SetCaption("Loading StepMania", "");
|
||||||
|
|
||||||
SDL_Surface *srf = IMG_ReadXPMFromArray(icon);
|
SDL_Surface *srf = IMG_ReadXPMFromArray(icon);
|
||||||
SDL_SetColorKey( srf, SDL_SRCCOLORKEY, SDL_MapRGB(srf->format, 0xFF, 0, 0xFF));
|
SDL_SetColorKey( srf, SDL_SRCCOLORKEY, SDL_MapRGB(srf->format, 0xFF, 0, 0xFF));
|
||||||
|
|||||||
@@ -133,7 +133,6 @@ bool LowLevelWindow_SDL::TryVideoMode( RageDisplay::VideoModeParams p, bool &bNe
|
|||||||
// NewOpenGLContext = true;
|
// NewOpenGLContext = true;
|
||||||
// }
|
// }
|
||||||
|
|
||||||
SDL_WM_SetCaption("StepMania", "StepMania");
|
|
||||||
|
|
||||||
// mySDL_EventState(SDL_OPENGLRESET, SDL_IGNORE);
|
// mySDL_EventState(SDL_OPENGLRESET, SDL_IGNORE);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user