BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix list spacing and size (again) (#10869)

Browse Source
This commit is contained in:
Vincent Robinson 2021-02-02 11:55:13 -08:00 committed by GitHub
parent 9388c23e86
commit f227e40180
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
games/devtest/mods/testformspec/formspec.lua
View File

@ -35,11 +35,30 @@ local tabheaders_fs = [[
local inv_style_fs = [[ local inv_style_fs = [[
style_type[list;noclip=true] style_type[list;noclip=true]
list[current_player;main;-1.125,-1.125;2,2] list[current_player;main;-0.75,0.75;2,2]
real_coordinates[false]
list[current_player;main;1.5,0;3,2]
real_coordinates[true]
real_coordinates[false]
style_type[list;size=1.1;spacing=0.1]
list[current_player;main;5,0;3,2]
real_coordinates[true]
style_type[list;size=.001;spacing=0]
list[current_player;main;7,3.5;8,4]
box[3,3.5;1,1;#000000]
box[5,3.5;1,1;#000000]
box[4,4.5;1,1;#000000]
box[3,5.5;1,1;#000000]
box[5,5.5;1,1;#000000]
style_type[list;spacing=.25,.125;size=.75,.875] style_type[list;spacing=.25,.125;size=.75,.875]
list[current_player;main;3,.5;3,3] list[current_player;main;3,3.5;3,3]
style_type[list;spacing=0;size=1]
list[current_player;main;.5,4;8,4] style_type[list;spacing=0;size=1.1]
list[current_player;main;.5,7;8,4]
]] ]]
local hypertext_basic = [[ local hypertext_basic = [[
@ -322,8 +341,7 @@ local pages = {
"container[0.5,1.5]" .. tabheaders_fs .. "container_end[]", "container[0.5,1.5]" .. tabheaders_fs .. "container_end[]",
-- Inv -- Inv
"size[12,13]real_coordinates[true]" .. "size[12,13]real_coordinates[true]" .. inv_style_fs,
"container[0.5,1.5]" .. inv_style_fs .. "container_end[]",
-- Animation -- Animation
[[ [[

34
src/gui/guiFormSpecMenu.cpp
View File

@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <cstdlib> #include <cstdlib>
#include <cmath>
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>
#include <limits> #include <limits>
@ -500,37 +501,34 @@ void GUIFormSpecMenu::parseList(parserData *data, const std::string &element)
auto style = getDefaultStyleForElement("list", spec.fname); auto style = getDefaultStyleForElement("list", spec.fname);
v2f32 slot_scale = style.getVector2f(StyleSpec::SIZE, v2f32(0, 0)); v2f32 slot_scale = style.getVector2f(StyleSpec::SIZE, v2f32(0, 0));
v2s32 slot_size( v2f32 slot_size(
slot_scale.X <= 0 ? imgsize.X : slot_scale.X * imgsize.X, slot_scale.X <= 0 ? imgsize.X : std::max<f32>(slot_scale.X * imgsize.X, 1),
slot_scale.Y <= 0 ? imgsize.Y : slot_scale.Y * imgsize.Y slot_scale.Y <= 0 ? imgsize.Y : std::max<f32>(slot_scale.Y * imgsize.Y, 1)
); );
v2f32 slot_spacing = style.getVector2f(StyleSpec::SPACING, v2f32(-1, -1)); v2f32 slot_spacing = style.getVector2f(StyleSpec::SPACING, v2f32(-1, -1));
if (data->real_coordinates) { v2f32 default_spacing = data->real_coordinates ?
slot_spacing.X = slot_spacing.X < 0 ? imgsize.X * 0.25f : v2f32(imgsize.X * 0.25f, imgsize.Y * 0.25f) :
v2f32(spacing.X - imgsize.X, spacing.Y - imgsize.Y);
slot_spacing.X = slot_spacing.X < 0 ? default_spacing.X :
imgsize.X * slot_spacing.X; imgsize.X * slot_spacing.X;
slot_spacing.Y = slot_spacing.Y < 0 ? imgsize.Y * 0.25f : slot_spacing.Y = slot_spacing.Y < 0 ? default_spacing.Y :
imgsize.Y * slot_spacing.Y; imgsize.Y * slot_spacing.Y;
slot_spacing.X += slot_size.X; slot_spacing += slot_size;
slot_spacing.Y += slot_size.Y;
} else {
slot_spacing.X = slot_spacing.X < 0 ? spacing.X :
slot_spacing.X * spacing.X;
slot_spacing.Y = slot_spacing.Y < 0 ? spacing.Y :
slot_spacing.Y * spacing.Y;
}
v2s32 pos = data->real_coordinates ? getRealCoordinateBasePos(v_pos) : v2s32 pos = data->real_coordinates ? getRealCoordinateBasePos(v_pos) :
getElementBasePos(&v_pos); getElementBasePos(&v_pos);
core::rect<s32> rect = core::rect<s32>(pos.X, pos.Y, core::rect<s32> rect = core::rect<s32>(pos.X, pos.Y,
pos.X + (geom.X - 1) * slot_spacing.X + imgsize.X, pos.X + (geom.X - 1) * slot_spacing.X + slot_size.X,
pos.Y + (geom.Y - 1) * slot_spacing.Y + imgsize.Y); pos.Y + (geom.Y - 1) * slot_spacing.Y + slot_size.Y);
GUIInventoryList *e = new GUIInventoryList(Environment, data->current_parent, GUIInventoryList *e = new GUIInventoryList(Environment, data->current_parent,
spec.fid, rect, m_invmgr, loc, listname, geom, start_i, slot_size, spec.fid, rect, m_invmgr, loc, listname, geom, start_i,
slot_spacing, this, data->inventorylist_options, m_font); v2s32(slot_size.X, slot_size.Y), slot_spacing, this,
data->inventorylist_options, m_font);
e->setNotClipped(style.getBool(StyleSpec::NOCLIP, false)); e->setNotClipped(style.getBool(StyleSpec::NOCLIP, false));

2
src/gui/guiInventoryList.cpp
View File

@ -104,8 +104,6 @@ void GUIInventoryList::draw()
&& m_invmgr->getInventory(selected_item->inventoryloc) == inv && m_invmgr->getInventory(selected_item->inventoryloc) == inv
&& selected_item->listname == m_listname && selected_item->listname == m_listname
&& selected_item->i == item_i; && selected_item->i == item_i;
core::rect<s32> clipped_rect(rect);
clipped_rect.clipAgainst(AbsoluteClippingRect);
bool hovering = m_hovered_i == item_i; bool hovering = m_hovered_i == item_i;
ItemRotationKind rotation_kind = selected ? IT_ROT_SELECTED : ItemRotationKind rotation_kind = selected ? IT_ROT_SELECTED :
(hovering ? IT_ROT_HOVERED : IT_ROT_NONE); (hovering ? IT_ROT_HOVERED : IT_ROT_NONE);