From bb1743105deb4a1dcc33ced1bae20276e1f084d9 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Fri, 9 Feb 2024 23:06:50 +0300
Subject: [PATCH] UiXmlReader padding fix

---
 res/layouts/inventory.xml    | 4 ++--
 src/frontend/gui/gui_xml.cpp | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/res/layouts/inventory.xml b/res/layouts/inventory.xml
index afe61bbd..dd1fe8c6 100644
--- a/res/layouts/inventory.xml
+++ b/res/layouts/inventory.xml
@@ -1,4 +1,4 @@
-<inventory color="#00000080" size="400,100">
+<inventory color="#00000080" size="400,0">
     <slots-grid cols="4" count="40"/>
-    <button coord="300,10">Test</button>
+    <button padding="10,10,10,10" coord="300,10">Test</button>
 </inventory>
diff --git a/src/frontend/gui/gui_xml.cpp b/src/frontend/gui/gui_xml.cpp
index 9df72ed6..f7ad4a96 100644
--- a/src/frontend/gui/gui_xml.cpp
+++ b/src/frontend/gui/gui_xml.cpp
@@ -69,7 +69,13 @@ static void _readPanel(UiXmlReader& reader, xml::xmlelement element, Panel& pane
     _readUINode(element, panel);
 
     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")) {
         panel.setResizing(false);