summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVincent Robinson <robinsonvincent89@gmail.com>2021-01-23 12:46:19 -0800
committerGitHub <noreply@github.com>2021-01-23 12:46:19 -0800
commit009e39e73b9aa003c369fe6bc88f366fdc91610e (patch)
treeb8e1fca357e8bf7dc6033170c4a929b0d6a2e643 /src
parent4c76239818f5159314f30883f98b977d30aaa26c (diff)
downloadminetest-009e39e73b9aa003c369fe6bc88f366fdc91610e.tar.gz
minetest-009e39e73b9aa003c369fe6bc88f366fdc91610e.tar.bz2
minetest-009e39e73b9aa003c369fe6bc88f366fdc91610e.zip
FormSpec: Add list spacing, slot size, and noclip (#10083)
* Add list spacing, slot size, and noclip * Simplify StyleSpec * Add test cases Co-authored-by: rubenwardy <rw@rubenwardy.com>
Diffstat (limited to 'src')
-rw-r--r--src/gui/StyleSpec.h47
-rw-r--r--src/gui/guiFormSpecMenu.cpp30
2 files changed, 57 insertions, 20 deletions
diff --git a/src/gui/StyleSpec.h b/src/gui/StyleSpec.h
index f2844ce28..fc92a861b 100644
--- a/src/gui/StyleSpec.h
+++ b/src/gui/StyleSpec.h
@@ -55,6 +55,8 @@ public:
BORDERCOLORS,
BORDERWIDTHS,
SOUND,
+ SPACING,
+ SIZE,
NUM_PROPERTIES,
NONE
};
@@ -119,6 +121,10 @@ public:
return BORDERWIDTHS;
} else if (name == "sound") {
return SOUND;
+ } else if (name == "spacing") {
+ return SPACING;
+ } else if (name == "size") {
+ return SIZE;
} else {
return NONE;
}
@@ -259,27 +265,40 @@ public:
return rect;
}
- irr::core::vector2d<s32> getVector2i(Property prop, irr::core::vector2d<s32> def) const
+ v2f32 getVector2f(Property prop, v2f32 def) const
{
const auto &val = properties[prop];
if (val.empty())
return def;
- irr::core::vector2d<s32> vec;
- if (!parseVector2i(val, &vec))
+ v2f32 vec;
+ if (!parseVector2f(val, &vec))
return def;
return vec;
}
- irr::core::vector2d<s32> getVector2i(Property prop) const
+ v2s32 getVector2i(Property prop, v2s32 def) const
+ {
+ const auto &val = properties[prop];
+ if (val.empty())
+ return def;
+
+ v2f32 vec;
+ if (!parseVector2f(val, &vec))
+ return def;
+
+ return v2s32(vec.X, vec.Y);
+ }
+
+ v2s32 getVector2i(Property prop) const
{
const auto &val = properties[prop];
FATAL_ERROR_IF(val.empty(), "Unexpected missing property");
- irr::core::vector2d<s32> vec;
- parseVector2i(val, &vec);
- return vec;
+ v2f32 vec;
+ parseVector2f(val, &vec);
+ return v2s32(vec.X, vec.Y);
}
gui::IGUIFont *getFont() const
@@ -432,22 +451,20 @@ private:
return true;
}
- bool parseVector2i(const std::string &value, irr::core::vector2d<s32> *parsed_vec) const
+ bool parseVector2f(const std::string &value, v2f32 *parsed_vec) const
{
- irr::core::vector2d<s32> vec;
+ v2f32 vec;
std::vector<std::string> v_vector = split(value, ',');
if (v_vector.size() == 1) {
- s32 x = stoi(v_vector[0]);
+ f32 x = stof(v_vector[0]);
vec.X = x;
vec.Y = x;
} else if (v_vector.size() == 2) {
- s32 x = stoi(v_vector[0]);
- s32 y = stoi(v_vector[1]);
- vec.X = x;
- vec.Y = y;
+ vec.X = stof(v_vector[0]);
+ vec.Y = stof(v_vector[1]);
} else {
- warningstream << "Invalid vector2d string format: \"" << value
+ warningstream << "Invalid 2d vector string format: \"" << value
<< "\"" << std::endl;
return false;
}
diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp
index 4415bdd3a..7b37de6f8 100644
--- a/src/gui/guiFormSpecMenu.cpp
+++ b/src/gui/guiFormSpecMenu.cpp
@@ -497,20 +497,40 @@ void GUIFormSpecMenu::parseList(parserData *data, const std::string &element)
3
);
- v2f32 slot_spacing = data->real_coordinates ?
- v2f32(imgsize.X * 1.25f, imgsize.Y * 1.25f) : spacing;
+ auto style = getDefaultStyleForElement("list", spec.fname);
- v2s32 pos = data->real_coordinates ? getRealCoordinateBasePos(v_pos)
- : getElementBasePos(&v_pos);
+ v2f32 slot_scale = style.getVector2f(StyleSpec::SIZE, v2f32(0, 0));
+ v2s32 slot_size(
+ slot_scale.X <= 0 ? imgsize.X : slot_scale.X * imgsize.X,
+ slot_scale.Y <= 0 ? imgsize.Y : slot_scale.Y * imgsize.Y
+ );
+
+ v2f32 slot_spacing = style.getVector2f(StyleSpec::SPACING, v2f32(-1, -1));
+ if (data->real_coordinates) {
+ slot_spacing.X = slot_spacing.X < 0 ? imgsize.X * 1.25f :
+ slot_spacing.X * imgsize.X + imgsize.X;
+ slot_spacing.Y = slot_spacing.Y < 0 ? imgsize.Y * 1.25f :
+ slot_spacing.Y * imgsize.Y + imgsize.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) :
+ getElementBasePos(&v_pos);
core::rect<s32> rect = core::rect<s32>(pos.X, pos.Y,
pos.X + (geom.X - 1) * slot_spacing.X + imgsize.X,
pos.Y + (geom.Y - 1) * slot_spacing.Y + imgsize.Y);
GUIInventoryList *e = new GUIInventoryList(Environment, data->current_parent,
- spec.fid, rect, m_invmgr, loc, listname, geom, start_i, imgsize,
+ spec.fid, rect, m_invmgr, loc, listname, geom, start_i, slot_size,
slot_spacing, this, data->inventorylist_options, m_font);
+ e->setNotClipped(style.getBool(StyleSpec::NOCLIP, false));
+
m_inventorylists.push_back(e);
m_fields.push_back(spec);
return;