Mirrorlandia_minetest/craftguide
1
0
Fork 0
mirror of https://github.com/minetest-mods/craftguide.git synced 2024-11-22 19:03:43 +01:00
Code Issues Projects Releases Wiki Activity

Improve grid display

Browse Source
This commit is contained in:
Jean-Patrick Guerrero 2019-09-05 14:24:11 +02:00
parent 2fa14ae146
commit ae4b15a748
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
init.lua
View File

@ -48,7 +48,7 @@ local DEFAULT_SIZE = 10
local MIN_LIMIT, MAX_LIMIT = 10, 12 local MIN_LIMIT, MAX_LIMIT = 10, 12
DEFAULT_SIZE = min(MAX_LIMIT, max(MIN_LIMIT, DEFAULT_SIZE)) DEFAULT_SIZE = min(MAX_LIMIT, max(MIN_LIMIT, DEFAULT_SIZE))
local GRID_LIMIT = 5 local GRID_LIMIT = 6
local FMT = { local FMT = {
box = "box[%f,%f;%f,%f;%s]", box = "box[%f,%f;%f,%f;%s]",
@ -455,16 +455,24 @@ local function get_recipe_fs(data, iY)
return concat(fs) return concat(fs)
end end
for i, item in pairs(recipe.items) do for i = 1, width * rows do
local item = recipe.items[i] or ""
local X = ceil((i - 1) % width + xoffset - width) - local X = ceil((i - 1) % width + xoffset - width) -
(sfinv_only and 0 or 0.2) (sfinv_only and 0 or 0.2)
local Y = ceil(i / width + (iY + 2) - min(2, rows)) local Y = ceil(i / width + (iY + 2) - min(2, rows))
if width > 3 or rows > 3 then if width > 3 or rows > 3 then
btn_size = width > 3 and 3 / width or 3 / rows local xof = 1 - 4 / width
local yof = 1 - 4 / rows
local x_y = width > rows and xof or yof
btn_size = width > rows and
(3.5 + (xof * 2)) / width or (3.5 + (yof * 2)) / rows
s_btn_size = btn_size s_btn_size = btn_size
X = btn_size * ((i - 1) % width) + xoffset - 2.65
Y = btn_size * floor((i - 1) / width) + (iY + 3) - min(2, rows) X = (btn_size * ((i - 1) % width) + xoffset - 2.49) * (0.83 - (x_y / 5))
Y = (btn_size * floor((i - 1) / width) + (iY + (1.98 + (x_y * 1.2)))) *
(0.86 - (x_y / 5))
end end
if X > rightest then if X > rightest then
@ -802,6 +810,7 @@ local function _fields(player, fields)
if fields.clear then if fields.clear then
reset_data(data) reset_data(data)
show_fs(player, name) show_fs(player, name)
return true
elseif fields.alternate then elseif fields.alternate then
if #data.recipes == 1 then if #data.recipes == 1 then
@ -811,6 +820,7 @@ local function _fields(player, fields)
local num_next = data.rnum + 1 local num_next = data.rnum + 1
data.rnum = data.recipes[num_next] and num_next or 1 data.rnum = data.recipes[num_next] and num_next or 1
show_fs(player, name) show_fs(player, name)
return true
elseif (fields.key_enter_field == "filter" or fields.search) and elseif (fields.key_enter_field == "filter" or fields.search) and
fields.filter ~= "" then fields.filter ~= "" then
@ -823,6 +833,7 @@ local function _fields(player, fields)
data.pagenum = 1 data.pagenum = 1
search(data) search(data)
show_fs(player, name) show_fs(player, name)
return true
elseif fields.prev or fields.next then elseif fields.prev or fields.next then
if data.pagemax == 1 then if data.pagemax == 1 then
@ -838,12 +849,14 @@ local function _fields(player, fields)
end end
show_fs(player, name) show_fs(player, name)
return true
elseif (fields.size_inc and data.iX < MAX_LIMIT) or elseif (fields.size_inc and data.iX < MAX_LIMIT) or
(fields.size_dec and data.iX > MIN_LIMIT) then (fields.size_dec and data.iX > MIN_LIMIT) then
data.pagenum = 1 data.pagenum = 1
data.iX = data.iX + (fields.size_inc and 1 or -1) data.iX = data.iX + (fields.size_inc and 1 or -1)
show_fs(player, name) show_fs(player, name)
return true
else else
local item local item
for field in pairs(fields) do for field in pairs(fields) do
@ -875,6 +888,7 @@ local function _fields(player, fields)
data.rnum = 1 data.rnum = 1
show_fs(player, name) show_fs(player, name)
return true
end end
end end