From 3f5a58a4e5d0477aa296ed3449e9e7ca1c1a0f8a Mon Sep 17 00:00:00 2001 From: grorp Date: Wed, 9 Oct 2024 18:46:21 +0200 Subject: [PATCH] Fix rebase mistake in #14840 after #14749 Old enable_touch was used instead of new touch_gui. --- builtin/fstk/tabview.lua | 4 ++-- builtin/mainmenu/tab_local.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/fstk/tabview.lua b/builtin/fstk/tabview.lua index 9f8889143..42fc9ac18 100644 --- a/builtin/fstk/tabview.lua +++ b/builtin/fstk/tabview.lua @@ -66,13 +66,13 @@ local function get_formspec(self) local content, prepend = tab.get_formspec(self, tab.name, tab.tabdata, tab.tabsize) - local ENABLE_TOUCH = core.settings:get_bool("enable_touch") + local TOUCH_GUI = core.settings:get_bool("touch_gui") local orig_tsize = tab.tabsize or { width = self.width, height = self.height } local tsize = { width = orig_tsize.width, height = orig_tsize.height } tsize.height = tsize.height + TABHEADER_H -- tabheader included in formspec size - + (ENABLE_TOUCH and GAMEBAR_OFFSET_TOUCH or GAMEBAR_OFFSET_DESKTOP) + + (TOUCH_GUI and GAMEBAR_OFFSET_TOUCH or GAMEBAR_OFFSET_DESKTOP) + GAMEBAR_H -- gamebar included in formspec size if self.parent == nil and not prepend then diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua index f0a7255d7..8d807cc79 100644 --- a/builtin/mainmenu/tab_local.lua +++ b/builtin/mainmenu/tab_local.lua @@ -92,11 +92,11 @@ function singleplayer_refresh_gamebar() end end - local ENABLE_TOUCH = core.settings:get_bool("enable_touch") + local TOUCH_GUI = core.settings:get_bool("touch_gui") local gamebar_pos_y = MAIN_TAB_H + TABHEADER_H -- tabheader included in formspec size - + (ENABLE_TOUCH and GAMEBAR_OFFSET_TOUCH or GAMEBAR_OFFSET_DESKTOP) + + (TOUCH_GUI and GAMEBAR_OFFSET_TOUCH or GAMEBAR_OFFSET_DESKTOP) local btnbar = buttonbar_create( "game_button_bar",