Fix rebase mistake in minetest#14840 after minetest#14749

Old enable_touch was used instead of new touch_gui.
j-r · Oct 9, 2024 · 3f5a58a · 3f5a58a
1 parent bd15f26
commit 3f5a58a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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",