From a449f98c451f12e3f159b349ea31f300cf19714c Mon Sep 17 00:00:00 2001 From: NyakoFox Date: Fri, 12 Apr 2024 08:27:58 -0300 Subject: [PATCH] Offset back button, fix buttons appearing in ingame menu when returning from options --- desktop_version/src/Game.cpp | 2 ++ desktop_version/src/Touch.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index f031d68d..78c251a0 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -7955,6 +7955,8 @@ static void returntoingametemp(void) { extern Game game; game.returntomenu(game.kludge_ingametemp); + // Hacky fix to prevent touch buttons from being stuck on the screen + touch::remove_dynamic_buttons(); } static void returntoedsettings(void) diff --git a/desktop_version/src/Touch.cpp b/desktop_version/src/Touch.cpp index bf6b5672..c19126b6 100644 --- a/desktop_version/src/Touch.cpp +++ b/desktop_version/src/Touch.cpp @@ -404,7 +404,7 @@ namespace touch buttons[TOUCH_BUTTON_CONFIRM].image = graphics.grphx.im_button_right; buttons[TOUCH_BUTTON_MAP_BACK].x = width - ((double)(240 - (int) graphics.lerp(graphics.oldmenuoffset, graphics.menuoffset)) / 240.0) * (60 * scale); - buttons[TOUCH_BUTTON_MAP_BACK].y = 0; + buttons[TOUCH_BUTTON_MAP_BACK].y = 8; buttons[TOUCH_BUTTON_MAP_BACK].width = 60 * scale; buttons[TOUCH_BUTTON_MAP_BACK].height = 26 * scale; buttons[TOUCH_BUTTON_MAP_BACK].text = loc::gettext("BACK");