From 22d2dc1cbe2dd6d1549980c074da2aaf104a2ff6 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 19 Mar 2024 17:18:26 +0300
Subject: [PATCH] fix

---
 src/frontend/menu/menu_pause.cpp | 20 ++++++++++----------
 src/graphics/ui/gui_xml.cpp      |  3 ++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/frontend/menu/menu_pause.cpp b/src/frontend/menu/menu_pause.cpp
index a77f72de..9d5cc33d 100644
--- a/src/frontend/menu/menu_pause.cpp
+++ b/src/frontend/menu/menu_pause.cpp
@@ -63,11 +63,11 @@ std::shared_ptr<Panel> menus::create_packs_panel(
         }
 
         if (!pack.creator.empty()) {
-            auto creatorlabel = std::make_shared<Label>("@"+pack.creator);
-            creatorlabel->setColor(glm::vec4(0.8f, 1.0f, 0.9f, 0.7f));
-            creatorlabel->setSize(glm::vec2(300, 20));
-            creatorlabel->setAlign(Align::right);
-            packpanel->add(creatorlabel, glm::vec2(215, 60));
+            packpanel->add(guiutil::create(
+                "<label color='#CCFFE5B2' size='300,20' align='right' pos='215,60'>"+
+                pack.creator+
+                "</label>"
+            ));
         }
 
         auto descriptionlabel = std::make_shared<Label>(pack.description);
@@ -77,11 +77,11 @@ std::shared_ptr<Panel> menus::create_packs_panel(
         packpanel->add(std::make_shared<Image>(icon, glm::vec2(64)), glm::vec2(8));
 
         if (remover && pack.id != "base") {
-            auto remimg = std::make_shared<Image>("gui/cross", glm::vec2(32));
-            remimg->setColor(glm::vec4(1.f, 1.f, 1.f, 0.5f));
-            auto rembtn = std::make_shared<Button>(remimg, glm::vec4(2));
-            rembtn->setColor(glm::vec4(0.0f));
-            rembtn->setHoverColor(glm::vec4(1.0f, 1.0f, 1.0f, 0.17f));
+            auto rembtn = std::dynamic_pointer_cast<Button>(guiutil::create(
+                "<button color='#00000000' hover-color='#FFFFFF2B'>"
+                "    <image src='gui/cross' size='32,32'/>"
+                "</button>"
+            ));
             rembtn->listenAction([=](GUI* gui) {
                 remover(pack);
             });
diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp
index f33a2263..a61d311c 100644
--- a/src/graphics/ui/gui_xml.cpp
+++ b/src/graphics/ui/gui_xml.cpp
@@ -200,7 +200,8 @@ static std::shared_ptr<UINode> readPanel(UiXmlReader& reader, xml::xmlelement el
 
 static std::shared_ptr<UINode> readButton(UiXmlReader& reader, xml::xmlelement element) {
     std::shared_ptr<Button> button;
-    if (!element->getElements().empty()) {
+    auto& elements = element->getElements();
+    if (!elements.empty() && elements.at(0)->getTag() != "#") {
         glm::vec4 padding = element->attr("padding", "0,0,0,0").asVec4();
         button = std::make_shared<Button>(reader.readUINode(element->getElements().at(0)), padding);
         _readPanel(reader, element, *button, false);