thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL: Call setupIcon for each window creation with SDL2.

Browse source 
This should make sure that the logo is properly set on Win32 with SDL2.
This commit is contained in:
Johannes Schickel 2015-03-01 16:20:02 +01:00
parent 71cc9e41e8
commit 066e71f61a
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
backends/platform/sdl/sdl-window.cpp
View file

@ -30,14 +30,13 @@
SdlWindow::SdlWindow() SdlWindow::SdlWindow()
#if SDL_VERSION_ATLEAST(2, 0, 0) #if SDL_VERSION_ATLEAST(2, 0, 0)
: _window(nullptr), _inputGrabState(false), _windowCaption("ScummVM"), _windowIcon(nullptr) : _window(nullptr), _inputGrabState(false), _windowCaption("ScummVM")
#endif #endif
{ {
} }
SdlWindow::~SdlWindow() { SdlWindow::~SdlWindow() {
#if SDL_VERSION_ATLEAST(2, 0, 0) #if SDL_VERSION_ATLEAST(2, 0, 0)
SDL_FreeSurface(_windowIcon);
destroyWindow(); destroyWindow();
#endif #endif
} }
@ -100,16 +99,14 @@ void SdlWindow::setupIcon() {
} }
#if SDL_VERSION_ATLEAST(2, 0, 0) #if SDL_VERSION_ATLEAST(2, 0, 0)
SDL_FreeSurface(_windowIcon);
_windowIcon = sdl_surf;
if (_window) { if (_window) {
SDL_SetWindowIcon(_window, sdl_surf); SDL_SetWindowIcon(_window, sdl_surf);
} }
#else #else
SDL_WM_SetIcon(sdl_surf, NULL); SDL_WM_SetIcon(sdl_surf, NULL);
SDL_FreeSurface(sdl_surf);
#endif #endif
SDL_FreeSurface(sdl_surf);
free(icon); free(icon);
} }
@ -214,7 +211,7 @@ bool SdlWindow::createWindow(int width, int height, uint32 flags) {
if (!_window) { if (!_window) {
return false; return false;
} }
SDL_SetWindowIcon(_window, _windowIcon); setupIcon();
return true; return true;
} }

1
backends/platform/sdl/sdl-window.h
View file

@ -101,7 +101,6 @@ protected:
private: private:
bool _inputGrabState; bool _inputGrabState;
Common::String _windowCaption; Common::String _windowCaption;
SDL_Surface *_windowIcon;
#endif #endif
}; };