blocky_portaling/unified_inventory
1
0
Fork 0
forked from Mirrorlandia_minetest/unified_inventory
Code Issues Pull Requests Projects Releases Wiki Activity

make waypoints explicitly reference full-style vars

Browse Source 
(since it does not support lite mode)
This commit is contained in:
Vanessa Dannenberg 2021-03-07 08:00:12 -05:00
parent 5a8a75f43b
commit b3077898a7
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
waypoints.lua
View File

@ -17,27 +17,27 @@ local waypoints_temp = {}
unified_inventory.register_page("waypoints", { unified_inventory.register_page("waypoints", {
get_formspec = function(player) get_formspec = function(player)
local player_name = player:get_player_name() local player_name = player:get_player_name()
local wp_info_x = unified_inventory.form_header_x + 1.25 local wp_info_x = unified_inventory.style_full.form_header_x + 1.25
local wp_info_y = unified_inventory.form_header_y + 0.5 local wp_info_y = unified_inventory.style_full.form_header_y + 0.5
local wp_bottom_row = unified_inventory.std_inv_y - 1 local wp_bottom_row = unified_inventory.style_full.std_inv_y - 1
local wp_buttons_rj = unified_inventory.std_inv_x + 10.1 - unified_inventory.btn_spc local wp_buttons_rj = unified_inventory.style_full.std_inv_x + 10.1 - unified_inventory.style_full.btn_spc
local wp_edit_w = unified_inventory.btn_spc * 4 - 0.1 local wp_edit_w = unified_inventory.style_full.btn_spc * 4 - 0.1
-- build a "fake" temp entry if the server took too long -- build a "fake" temp entry if the server took too long
-- during sign-on and returned an empty entry -- during sign-on and returned an empty entry
if not waypoints_temp[player_name] then waypoints_temp[player_name] = {hud = 1} end if not waypoints_temp[player_name] then waypoints_temp[player_name] = {hud = 1} end
local waypoints = datastorage.get(player_name, "waypoints") local waypoints = datastorage.get(player_name, "waypoints")
local formspec = unified_inventory.standard_inv_bg.. local formspec = unified_inventory.style_full.standard_inv_bg..
"label["..unified_inventory.form_header_x..","..unified_inventory.form_header_y..";" .. F(S("Waypoints")) .. "]".. "label["..unified_inventory.style_full.form_header_x..","..unified_inventory.style_full.form_header_y..";" .. F(S("Waypoints")) .. "]"..
"image["..wp_info_x..","..wp_info_y..";1,1;ui_waypoints_icon.png]" "image["..wp_info_x..","..wp_info_y..";1,1;ui_waypoints_icon.png]"
-- Tabs buttons: -- Tabs buttons:
for i = 1, 5 do for i = 1, 5 do
formspec = formspec .. formspec = formspec ..
"image_button["..unified_inventory.main_button_x..",".. "image_button["..unified_inventory.style_full.main_button_x..","..
(wp_bottom_row - (5-i) * unified_inventory.btn_spc)..";".. (wp_bottom_row - (5-i) * unified_inventory.style_full.btn_spc)..";"..
unified_inventory.btn_size..","..unified_inventory.btn_size..";" .. unified_inventory.style_full.btn_size..","..unified_inventory.style_full.btn_size..";" ..
(i == waypoints.selected and "ui_blue_icon_background.png^" or "") .. (i == waypoints.selected and "ui_blue_icon_background.png^" or "") ..
"ui_" .. i .. "_icon.png;" .. "ui_" .. i .. "_icon.png;" ..
"select_waypoint" .. i .. ";]" .. "select_waypoint" .. i .. ";]" ..
@ -63,9 +63,9 @@ unified_inventory.register_page("waypoints", {
local x = 4 local x = 4
for _, b in pairs(btnlist) do for _, b in pairs(btnlist) do
formspec = formspec .. formspec = formspec ..
"image_button["..(wp_buttons_rj - unified_inventory.btn_spc * x)..",".. "image_button["..(wp_buttons_rj - unified_inventory.style_full.btn_spc * x)..","..
wp_bottom_row..";".. wp_bottom_row..";"..
unified_inventory.btn_size..","..unified_inventory.btn_size..";".. unified_inventory.style_full.btn_size..","..unified_inventory.style_full.btn_size..";"..
b[1]..";".. b[1]..";"..
b[2]..i..";]".. b[2]..i..";]"..
"tooltip["..b[2]..i..";"..F(S(b[3], b[4] or "")).."]" "tooltip["..b[2]..i..";"..F(S(b[3], b[4] or "")).."]"
@ -82,11 +82,11 @@ unified_inventory.register_page("waypoints", {
if temp.edit then if temp.edit then
formspec = formspec .. formspec = formspec ..
"field["..(wp_buttons_rj - wp_edit_w - 0.1)..","..(wp_bottom_row - unified_inventory.btn_spc)..";".. "field["..(wp_buttons_rj - wp_edit_w - 0.1)..","..(wp_bottom_row - unified_inventory.style_full.btn_spc)..";"..
wp_edit_w..","..unified_inventory.btn_size..";rename_box" .. i .. ";;".. wp_edit_w..","..unified_inventory.style_full.btn_size..";rename_box" .. i .. ";;"..
(waypoint.name or default_name).."]" .. (waypoint.name or default_name).."]" ..
"image_button["..wp_buttons_rj..","..(wp_bottom_row - unified_inventory.btn_spc)..";".. "image_button["..wp_buttons_rj..","..(wp_bottom_row - unified_inventory.style_full.btn_spc)..";"..
unified_inventory.btn_size..","..unified_inventory.btn_size..";".. unified_inventory.style_full.btn_size..","..unified_inventory.style_full.btn_size..";"..
"ui_ok_icon.png;".. "ui_ok_icon.png;"..
"confirm_rename"..i.. ";]".. "confirm_rename"..i.. ";]"..
"tooltip[confirm_rename" .. i .. ";" "tooltip[confirm_rename" .. i .. ";"