Fix how the current "Display Size" is calculated to correctly take th…

…e scale into account.
hades-emu · Oct 17, 2024 · a54edaf · a54edaf
1 parent 2aa1cf5
commit a54edaf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/source/app/windows/menubar.c b/source/app/windows/menubar.c
@@ -321,8 +321,8 @@ app_win_menubar_video(
                 if (igMenuItem_Bool(
                     display_sizes[x - 1],
                     NULL,
-                       app->ui.display.game.outer.width == GBA_SCREEN_WIDTH * x
-                    && app->ui.display.game.outer.height == GBA_SCREEN_HEIGHT * x,
+                       app->ui.display.game.outer.width == (uint32_t)round(GBA_SCREEN_WIDTH * x / app->ui.scale)
+                    && app->ui.display.game.outer.height == (uint32_t)round(GBA_SCREEN_HEIGHT * x / app->ui.scale),
                     true
                 )) {
                     app->settings.video.display_size = x;

diff --git a/source/app/windows/settings.c b/source/app/windows/settings.c
@@ -445,8 +445,8 @@ app_win_settings_video(
         display_size = -1;
         for (i = 1; i < array_length(display_size_names) + 1; ++i) {
             if (
-                   app->ui.display.game.outer.width == GBA_SCREEN_WIDTH * i
-                && app->ui.display.game.outer.height == GBA_SCREEN_HEIGHT * i
+                   app->ui.display.game.outer.width == (uint32_t)round(GBA_SCREEN_WIDTH * i / app->ui.scale)
+                && app->ui.display.game.outer.height == (uint32_t)round(GBA_SCREEN_HEIGHT * i / app->ui.scale)
             ) {
                 display_size = i;
                 break;