jadedctrl/ minetest-i4
1
0
Disbranĉigi 0
Fontkodo Issues Tirpetoj Actions Packages Projects Eldonoj Wiki Activity

Some adjusting

This commit is contained in:
Jean-Patrick Guerrero 2022-08-07 01:10:32 +02:00
parent 48ab26b4c6
commit a67ef8b08b
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/callbacks.lua
View File

@ -149,6 +149,7 @@ local function init_data(player, info)
data.itab = 1 data.itab = 1
data.subcat = 1 data.subcat = 1
data.scrbar_inv = 0 data.scrbar_inv = 0
data.font_size = data.font_size or 0
data.lang_code = get_lang_code(info) data.lang_code = get_lang_code(info)
data.fs_version = info.formspec_version data.fs_version = info.formspec_version

36
src/gui.lua
View File

@ -37,10 +37,16 @@ local function weird_desc(str)
return not true_str(str) or find(str, "\n") or not find(str, "%u") return not true_str(str) or find(str, "\n") or not find(str, "%u")
end end
local function snip(str, limit) local function snip(str, limit, font_size)
limit -= (font_size > 3 and font_size + 1 or font_size)
if utf8_len(str) > limit then
return fmt("%s...", sub(str, 1, limit - 3)) return fmt("%s...", sub(str, 1, limit - 3))
end end
return str
end
local function get_desc(item, lang_code) local function get_desc(item, lang_code)
if sub(item, 1, 1) == "_" then if sub(item, 1, 1) == "_" then
item = sub(item, 2) item = sub(item, 2)
@ -175,13 +181,8 @@ local function get_award_list(data, fs, ctn_len, yextra, award_list, awards_unlo
local desc_lim, _desc = 39 local desc_lim, _desc = 39
local icon_size = 1.1 local icon_size = 1.1
if utf8_len(title) > title_lim then _title = snip(title, title_lim, data.font_size)
_title = snip(title, title_lim) _desc = snip(desc, desc_lim, data.font_size)
end
if utf8_len(desc) > desc_lim then
_desc = snip(desc, desc_lim)
end
if not award.unlocked and def.secret then if not award.unlocked and def.secret then
title = ES"Secret award" title = ES"Secret award"
@ -317,10 +318,7 @@ local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
box(0, y, ctn_len, 0.6, "") box(0, y, ctn_len, 0.6, "")
local waypoint_name, lim = v.name, 18 local waypoint_name, lim = v.name, 18
waypoint_name = snip(waypoint_name, lim, data.font_size)
if utf8_len(v.name) > lim then
waypoint_name = snip(waypoint_name, lim)
end
local hex = fmt("%02x", v.color) local hex = fmt("%02x", v.color)
@ -370,9 +368,9 @@ local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
if waypoint_preview then if waypoint_preview then
image(0.25, y - 3.5, 5, 4, PNG.bg_content) image(0.25, y - 3.5, 5, 4, PNG.bg_content)
fs"style[area_preview;font_size=16]"
button(0.25, y - 3.35, 5, 0.55, "area_preview", v.name) button(0.25, y - 3.35, 5, 0.55, "area_preview", v.name)
image_button(4.65, y - 3.25, 0.25, 0.25, image_button(4.65, y - 3.25, 0.25, 0.25, PNG.cancel_hover .. "^\\[brighten", "close_preview", "")
PNG.cancel_hover .. "^\\[brighten", "close_preview", "")
local pos = str_to_pos(data.waypoints[i].pos) local pos = str_to_pos(data.waypoints[i].pos)
get_isometric_view(fs, pos, 0.6, y - 2.5) get_isometric_view(fs, pos, 0.6, y - 2.5)
@ -1182,15 +1180,11 @@ local function get_header(fs, data)
local Y1 = data.yoffset + 0.47 local Y1 = data.yoffset + 0.47
local Y2 = Y1 + 0.5 local Y2 = Y1 + 0.5
if utf8_len(desc) > desc_lim then
tooltip(X, Y1 - 0.1, 5.7, 0.24, desc) tooltip(X, Y1 - 0.1, 5.7, 0.24, desc)
desc = snip(desc, desc_lim) desc = snip(desc, desc_lim, data.font_size)
end
if utf8_len(tech_name) > name_lim then
tooltip(X, Y2 - 0.1, 5.7, 0.24, tech_name) tooltip(X, Y2 - 0.1, 5.7, 0.24, tech_name)
tech_name = snip(tech_name, name_lim) tech_name = snip(tech_name, name_lim, data.font_size)
end
fs"style_type[label;font=bold;font_size=20]" fs"style_type[label;font=bold;font_size=20]"
label(X, Y1, desc) label(X, Y1, desc)
@ -1488,7 +1482,7 @@ local function get_tabs_fs(fs, player, data, full_height)
if true_str(def.image) then if true_str(def.image) then
local desc = translate(data.lang_code, def.description) local desc = translate(data.lang_code, def.description)
local desc_len = utf8_len(desc) local desc_len = utf8_len(desc) + data.font_size
fs("style_type[image;noclip=true]") fs("style_type[image;noclip=true]")
image(X + (tab_len / 2) - ((desc_len * 0.1) / 2) - 0.55, Y + 0.05, 0.35, 0.35, def.image) image(X + (tab_len / 2) - ((desc_len * 0.1) / 2) - 0.55, Y + 0.05, 0.35, 0.35, def.image)