kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update SDL and update how we handle retina

Browse Source
This commit is contained in:
Joshua Granick
2015-10-05 11:50:21 -07:00
parent 17669fed07
commit 0c087177c1
4 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
project/src/backend/sdl/SDLApplication.cpp
View File

@@ -536,8 +536,9 @@ namespace lime {
case SDL_WINDOWEVENT_SIZE_CHANGED:
windowEvent.type = WINDOW_RESIZE;
windowEvent.width = event->window.data1;
windowEvent.height = event->window.data2;
SDL_GL_GetDrawableSize (SDL_GetWindowFromID (event->window.windowID), &windowEvent.width, &windowEvent.height);
//windowEvent.width = event->window.data1;
//windowEvent.height = event->window.data2;
break;
case SDL_WINDOWEVENT_RESTORED: windowEvent.type = WINDOW_RESTORE; break;

28
project/src/backend/sdl/SDLWindow.cpp
View File

@@ -25,7 +25,7 @@ namespace lime {
if (flags & WINDOW_FLAG_HARDWARE) {
sdlFlags |= SDL_WINDOW_OPENGL;
//sdlFlags |= SDL_WINDOW_ALLOW_HIGHDPI;
sdlFlags |= SDL_WINDOW_ALLOW_HIGHDPI;
#if defined (HX_WINDOWS) && defined (NATIVE_TOOLKIT_SDL_ANGLE)
SDL_GL_SetAttribute (SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
@@ -173,7 +173,19 @@ namespace lime {
int width;
int height;
SDL_GetWindowSize (sdlWindow, &width, &height);
SDL_GL_GetDrawableSize (sdlWindow, &width, &height);
SDL_Renderer* sdlRenderer = SDL_GetRenderer (sdlWindow);
if (sdlRenderer) {
SDL_GetRendererOutputSize (sdlRenderer, &width, &height);
} else {
SDL_GetWindowSize (sdlWindow, &width, &height);
}
return height;
@@ -192,7 +204,17 @@ namespace lime {
int width;
int height;
SDL_GetWindowSize (sdlWindow, &width, &height);
SDL_Renderer* sdlRenderer = SDL_GetRenderer (sdlWindow);
if (sdlRenderer) {
SDL_GetRendererOutputSize (sdlRenderer, &width, &height);
} else {
SDL_GetWindowSize (sdlWindow, &width, &height);
}
return width;