luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-11-04 09:15:29 +01:00
Code Activity

Use formspec version 6 in the main menu (#13761)

Browse Source
This commit is contained in:
rubenwardy
2023-08-28 22:36:54 +01:00
committed by GitHub
parent 7b56daa236
commit 0cbf96cc83
7 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
builtin/fstk/buttonbar.lua
View File

@@ -22,8 +22,9 @@ local function buttonbar_formspec(self)
return ""
end
local formspec = string.format("box[%f,%f;%f,%f;%s]",
self.pos.x,self.pos.y ,self.size.x,self.size.y,self.bgcolor)
local formspec = "style_type[box;noclip=true]" ..
string.format("box[%f,%f;%f,%f;%s]", self.pos.x, self.pos.y, self.size.x, self.size.y, self.bgcolor) ..
"style_type[box;noclip=false]"
for i=self.startbutton,#self.buttons,1 do
local btn_name = self.buttons[i].name
@@ -31,18 +32,18 @@ local function buttonbar_formspec(self)
if self.orientation == "horizontal" then
btn_pos.x = self.pos.x + --base pos
(i - self.startbutton) * self.btn_size + --button offset
(i - self.startbutton) * self.btn_size * 1.25 + --button offset
self.btn_initial_offset
else
btn_pos.x = self.pos.x + (self.btn_size * 0.05)
btn_pos.x = self.pos.x + self.size.x / 2 - self.btn_size / 2
end
if self.orientation == "vertical" then
btn_pos.y = self.pos.y + --base pos
(i - self.startbutton) * self.btn_size + --button offset
(i - self.startbutton) * self.btn_size * 1.25 + --button offset
self.btn_initial_offset
else
btn_pos.y = self.pos.y + (self.btn_size * 0.05)
btn_pos.y = self.pos.y + self.size.y / 2 - self.btn_size / 2
end
if (self.orientation == "vertical" and
@@ -195,16 +196,17 @@ function buttonbar_create(name, cbf_buttonhandler, pos, orientation, size)
self.have_move_buttons = false
self.hidden = false
if self.orientation == "horizontal" then
self.btn_size = self.size.y
else
self.btn_size = self.size.x
if self.btn_initial_offset == nil then
self.btn_initial_offset = 0.375
end
if (self.btn_initial_offset == nil) then
self.btn_initial_offset = self.btn_size * 0.05
if self.orientation == "horizontal" then
self.btn_size = self.size.y - 2*0.1
else
self.btn_size = self.size.x - 2*0.1
end
self.userbuttonhandler = cbf_buttonhandler
self.buttons = {}

2
builtin/fstk/tabview.lua
View File

@@ -42,7 +42,7 @@ local function add_tab(self,tab)
event_handler = tab.cbf_events,
get_formspec = tab.cbf_formspec,
tabsize = tab.tabsize,
formspec_version = tab.formspec_version,
formspec_version = tab.formspec_version or 6,
on_change = tab.on_change,
tabdata = {},
}