PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

UiXmlReader padding fix

Browse Source
This commit is contained in:
MihailRis
2024-02-09 23:06:50 +03:00
parent 6fc312b651
commit bb1743105d
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layouts/inventory.xml
+2 -2
View File
@@ -1,4 +1,4 @@
<inventory color="#00000080" size="400,100"> <inventory color="#00000080" size="400,0">
<slots-grid cols="4" count="40"/> <slots-grid cols="4" count="40"/>
<button coord="300,10">Test</button> <button padding="10,10,10,10" coord="300,10">Test</button>
</inventory> </inventory>
src/frontend/gui/gui_xml.cpp
+7 -1
View File
@@ -69,7 +69,13 @@ static void _readPanel(UiXmlReader& reader, xml::xmlelement element, Panel& pane
_readUINode(element, panel); _readUINode(element, panel);
if (element->has("padding")) { if (element->has("padding")) {
panel.setPadding(element->attr("padding").asVec4()); glm::vec4 padding = element->attr("padding").asVec4();
panel.setPadding(padding);
glm::vec2 size = panel.getSize();
panel.setSize(glm::vec2(
size.x + padding.x + padding.z,
size.y + padding.y + padding.w
));
} }
if (element->has("size")) { if (element->has("size")) {
panel.setResizing(false); panel.setResizing(false);