Add scroll bar for overflowing tab buttons (#195)

This commit is contained in:
SmallJoker 2022-02-26 11:41:15 +01:00 committed by GitHub
parent 3074d625e2
commit dbe06be68b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 19 deletions

View File

@ -65,10 +65,16 @@ ui.style_full = {
formspec_y = 1, formspec_y = 1,
formw = 17.75, formw = 17.75,
formh = 12.25, formh = 12.25,
-- Item browser size, pos
pagecols = 8, pagecols = 8,
pagerows = 9, pagerows = 9,
page_x = 10.75, page_x = 10.75,
page_y = 2.30, page_y = 2.30,
-- Item browser controls
page_buttons_x = 11.60,
page_buttons_y = 10.15,
searchwidth = 3.4,
-- Crafting grid positions
craft_x = 2.8, craft_x = 2.8,
craft_y = 1.15, craft_y = 1.15,
craftresult_x = 7.8, craftresult_x = 7.8,
@ -80,13 +86,15 @@ ui.style_full = {
craft_guide_resultstr_x = 0.3, craft_guide_resultstr_x = 0.3,
craft_guide_resultstr_y = 0.6, craft_guide_resultstr_y = 0.6,
give_btn_x = 0.25, give_btn_x = 0.25,
-- Tab switching buttons
main_button_x = 0.4, main_button_x = 0.4,
main_button_y = 11.0, main_button_y = 11.0,
page_buttons_x = 11.60, main_button_cols = 12,
page_buttons_y = 10.15, main_button_rows = 1,
searchwidth = 3.4, -- Tab title position
form_header_x = 0.4, form_header_x = 0.4,
form_header_y = 0.4, form_header_y = 0.4,
-- Generic sizes
btn_spc = 0.85, btn_spc = 0.85,
btn_size = 0.75, btn_size = 0.75,
std_inv_x = 0.3, std_inv_x = 0.3,
@ -98,10 +106,16 @@ ui.style_lite = {
formspec_y = 0.6, formspec_y = 0.6,
formw = 14, formw = 14,
formh = 9.75, formh = 9.75,
-- Item browser size, pos
pagecols = 4, pagecols = 4,
pagerows = 5, pagerows = 5,
page_x = 10.5, page_x = 10.5,
page_y = 2.15, page_y = 2.15,
-- Item browser controls
page_buttons_x = 10.5,
page_buttons_y = 6.15,
searchwidth = 1.6,
-- Crafting grid positions
craft_x = 2.6, craft_x = 2.6,
craft_y = 0.75, craft_y = 0.75,
craftresult_x = 5.75, craftresult_x = 5.75,
@ -113,13 +127,15 @@ ui.style_lite = {
craft_guide_resultstr_x = 0.15, craft_guide_resultstr_x = 0.15,
craft_guide_resultstr_y = 0.35, craft_guide_resultstr_y = 0.35,
give_btn_x = 0.15, give_btn_x = 0.15,
-- Tab switching buttons
main_button_x = 10.5, main_button_x = 10.5,
main_button_y = 8.15, main_button_y = 8.15,
page_buttons_x = 10.5, main_button_cols = 4,
page_buttons_y = 6.15, main_button_rows = 2,
searchwidth = 1.6, -- Tab title position
form_header_x = 0.2, form_header_x = 0.2,
form_header_y = 0.2, form_header_y = 0.2,
-- Generic sizes
btn_spc = 0.8, btn_spc = 0.8,
btn_size = 0.7, btn_size = 0.7,
std_inv_x = 0.1, std_inv_x = 0.1,

View File

@ -18,7 +18,7 @@ function ui.demangle_for_formspec(str)
return string.gsub(str, "_([0-9]+)_", function (v) return string.char(v) end) return string.gsub(str, "_([0-9]+)_", function (v) return string.char(v) end)
end end
-- Get the player-specific unified_inventory style
function ui.get_per_player_formspec(player_name) function ui.get_per_player_formspec(player_name)
local draw_lite_mode = ui.lite_mode and not minetest.check_player_privs(player_name, {ui_full=true}) local draw_lite_mode = ui.lite_mode and not minetest.check_player_privs(player_name, {ui_full=true})
@ -27,6 +27,7 @@ function ui.get_per_player_formspec(player_name)
return style return style
end end
-- Creates an item image or regular image button with a tooltip
local function formspec_button(ui_peruser, name, image, offset, pos, scale, label) local function formspec_button(ui_peruser, name, image, offset, pos, scale, label)
local element = 'image_button' local element = 'image_button'
if minetest.registered_items[image] then if minetest.registered_items[image] then
@ -43,9 +44,8 @@ local function formspec_button(ui_peruser, name, image, offset, pos, scale, labe
string.format("tooltip[%s;%s]", name, F(label or name)) string.format("tooltip[%s;%s]", name, F(label or name))
end end
local function formspec_add_filters(player, formspec, style) -- Add registered buttons (tabs)
local button_row = 0 local function formspec_tab_buttons(player, formspec, style)
local button_col = 0
local n = #formspec + 1 local n = #formspec + 1
-- Main buttons -- Main buttons
@ -58,32 +58,50 @@ local function formspec_add_filters(player, formspec, style)
end end
end end
local needs_scrollbar = #filtered_inv_buttons > style.main_button_cols * style.main_button_rows
formspec[n] = ("scroll_container[%g,%g;%g,%g;tabbtnscroll;vertical]"):format(
style.main_button_x, style.main_button_y, -- position
style.main_button_cols * style.btn_spc, style.main_button_rows -- size
)
n = n + 1
for i, def in pairs(filtered_inv_buttons) do for i, def in pairs(filtered_inv_buttons) do
if style.is_lite_mode and i > 4 then local pos_x = ((i - 1) % style.main_button_cols) * style.btn_spc
button_row = 1 local pos_y = math.floor((i - 1) / style.main_button_cols) * style.btn_spc
button_col = 1
end
if def.type == "image" then if def.type == "image" then
local pos_x = style.main_button_x + style.btn_spc * (i - 1) - button_col * style.btn_spc * 4
local pos_y = style.main_button_y + button_row * style.btn_spc
if (def.condition == nil or def.condition(player) == true) then if (def.condition == nil or def.condition(player) == true) then
formspec[n] = string.format("image_button[%f,%f;%f,%f;%s;%s;]", formspec[n] = string.format("image_button[%g,%g;%g,%g;%s;%s;]",
pos_x, pos_y, style.btn_size, style.btn_size, pos_x, pos_y, style.btn_size, style.btn_size,
F(def.image), F(def.image),
F(def.name)) F(def.name))
formspec[n+1] = "tooltip["..F(def.name)..";"..(def.tooltip or "").."]" formspec[n+1] = "tooltip["..F(def.name)..";"..(def.tooltip or "").."]"
n = n+2 n = n+2
else else
formspec[n] = string.format("image[%f,%f;%f,%f;%s^[colorize:#808080:alpha]", formspec[n] = string.format("image[%g,%g;%g,%g;%s^[colorize:#808080:alpha]",
pos_x, pos_y, style.btn_size, style.btn_size, pos_x, pos_y, style.btn_size, style.btn_size,
def.image) def.image)
n = n+1 n = n+1
end end
end end
end end
formspec[n] = "scroll_container_end[]"
if needs_scrollbar then
formspec[n+1] = ("scrollbaroptions[max=%i;arrows=hide]"):format(
-- This calculation is not 100% accurate but "good enough"
math.ceil((#filtered_inv_buttons - 1) / style.main_button_cols) * style.btn_spc * 5
)
formspec[n+2] = ("scrollbar[%g,%g;0.4,%g;vertical;tabbtnscroll;0]"):format(
style.main_button_x + style.main_button_cols * style.btn_spc - 0.1, -- x pos
style.main_button_y, -- y pos
style.main_button_rows * style.btn_spc -- height
)
formspec[n+3] = "scrollbaroptions[max=1000;arrows=default]"
end
end end
-- Add category GUI elements (top right)
local function formspec_add_categories(player, formspec, ui_peruser) local function formspec_add_categories(player, formspec, ui_peruser)
local player_name = player:get_player_name() local player_name = player:get_player_name()
local n = #formspec + 1 local n = #formspec + 1
@ -280,7 +298,7 @@ function ui.get_formspec(player, page)
fs[#fs + 1] = fsdata.formspec fs[#fs + 1] = fsdata.formspec
formspec_add_filters(player, fs, ui_peruser) formspec_tab_buttons(player, fs, ui_peruser)
if fsdata.draw_inventory ~= false then if fsdata.draw_inventory ~= false then
-- Player inventory -- Player inventory