UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Ion/SDL] Fix conflicts with master

Browse Source
This commit is contained in:
Joachim LF
2020-10-11 12:37:44 +02:00
parent e8b86ca6a1
commit ab906da53d
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ion/src/simulator/shared/main_sdl.cpp
View File

@@ -278,6 +278,7 @@ void relayout() {
SDL_GetWindowSize(sWindow, &windowWidth, &windowHeight);
SDL_RenderSetLogicalSize(sRenderer, windowWidth, windowHeight);
#if !EPSILON_SDL_SCREEN_ONLY
if (argument_screen_only) {
// Keep original aspect ration in screen_only mode.
float scale = (float)(Ion::Display::Width) / (float)(Ion::Display::Height);
@@ -294,6 +295,12 @@ void relayout() {
} else {
Layout::recompute(windowWidth, windowHeight);
}
#else
sScreenRect.x = 0;
sScreenRect.y = 0;
sScreenRect.w = windowWidth;
sScreenRect.h = windowHeight;
#endif
setNeedsRefresh();
}
@@ -307,6 +314,9 @@ void refresh() {
return;
}
#if EPSILON_SDL_SCREEN_ONLY
Display::draw(sRenderer, &sScreenRect);
#else
if (argument_screen_only) {
Display::draw(sRenderer, &sScreenRect);
} else {
@@ -319,6 +329,7 @@ void refresh() {
Layout::draw(sRenderer);
Display::draw(sRenderer, &screenRect);
}
#endif
SDL_RenderPresent(sRenderer);