Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-20 06:33:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix rebase mistake in #14840 after #14749

Browse Source 
Old enable_touch was used instead of new touch_gui.
This commit is contained in:
grorp 2024-10-09 18:46:21 +02:00
parent bd15f26c35
commit 3f5a58a4e5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/fstk/tabview.lua
View File

@ -66,13 +66,13 @@ local function get_formspec(self)
local content, prepend = tab.get_formspec(self, tab.name, tab.tabdata, tab.tabsize) 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 orig_tsize = tab.tabsize or { width = self.width, height = self.height }
local tsize = { width = orig_tsize.width, height = orig_tsize.height } local tsize = { width = orig_tsize.width, height = orig_tsize.height }
tsize.height = tsize.height tsize.height = tsize.height
+ TABHEADER_H -- tabheader included in formspec size + 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 + GAMEBAR_H -- gamebar included in formspec size
if self.parent == nil and not prepend then if self.parent == nil and not prepend then

4
builtin/mainmenu/tab_local.lua
View File

@ -92,11 +92,11 @@ function singleplayer_refresh_gamebar()
end end
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 local gamebar_pos_y = MAIN_TAB_H
+ TABHEADER_H -- tabheader included in formspec size + 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( local btnbar = buttonbar_create(
"game_button_bar", "game_button_bar",