From b590764026dd8ffc33b0c13438a8a0c6cc2d04e6 Mon Sep 17 00:00:00 2001 From: luk3yx Date: Thu, 5 Jan 2023 02:35:46 +1300 Subject: [PATCH] Centre page number label and move refill/trash labels (#221) * Centre page number label * Move refill and trash labels --- internal.lua | 8 +++++--- register.lua | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/internal.lua b/internal.lua index 45db6b3..0903d86 100644 --- a/internal.lua +++ b/internal.lua @@ -274,9 +274,11 @@ local function formspec_add_item_browser(player, formspec, ui_peruser) end end end - formspec[n] = string.format("label[%f,%f;%s: %s]", - ui_peruser.page_buttons_x + ui_peruser.btn_spc * (ui_peruser.is_lite_mode and 1 or 2), - ui_peruser.page_buttons_y + 0.1 + ui_peruser.btn_spc * 2, + formspec[n] = "style[page_number;content_offset=0]" + formspec[n + 1] = string.format("image_button[%f,%f;%f,0.4;;page_number;%s: %s;false;false;]", + ui_peruser.page_buttons_x, + ui_peruser.page_buttons_y + ui_peruser.btn_spc * 2 - 0.1, + ui_peruser.btn_spc * (bn - 1) + ui_peruser.btn_size, F(S("Page")), S("@1 of @2",page2,pagemax)) end diff --git a/register.lua b/register.lua index 1f72bfe..9af6421 100644 --- a/register.lua +++ b/register.lua @@ -183,14 +183,14 @@ ui.register_page("craft", { local n=#formspec+1 if ui.trash_enabled or ui.is_creative(player_name) or minetest.get_player_privs(player_name).give then - formspec[n] = string.format("label[%f,%f;%s]", craftx + 6.45, crafty + 2.4, F(S("Trash:"))) + formspec[n] = string.format("label[%f,%f;%s]", craftx + 6.35, crafty + 2.3, F(S("Trash:"))) formspec[n+1] = ui.make_trash_slot(craftx + 6.25, crafty + 2.5) n=n + 2 end if ui.is_creative(player_name) then formspec[n] = ui.single_slot(craftx - 2.5, crafty + 2.5) - formspec[n+1] = string.format("label[%f,%f;%s]", craftx - 2.3, crafty + 2.4,F(S("Refill:"))) + formspec[n+1] = string.format("label[%f,%f;%s]", craftx - 2.4, crafty + 2.3, F(S("Refill:"))) formspec[n+2] = string.format("list[detached:%srefill;main;%f,%f;1,1;]", F(player_name), craftx - 2.5 + ui.list_img_offset, crafty + 2.5 + ui.list_img_offset) end