From 8b1c102cfe9fe6db53210cc53e82a1907ac2189c Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 5 May 2024 23:37:40 +0300
Subject: [PATCH] default multiline labels valign set to 'top' + content panel
 width increased

---
 res/layouts/pages/content.xml        | 10 +++++-----
 res/layouts/templates/pack.xml       |  6 +++---
 src/graphics/ui/elements/Label.cpp   | 22 ++++++----------------
 src/graphics/ui/gui_xml.cpp          |  3 +++
 src/logic/scripting/lua/LuaState.cpp |  1 -
 5 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/res/layouts/pages/content.xml b/res/layouts/pages/content.xml
index d070212d..c4ff39e2 100644
--- a/res/layouts/pages/content.xml
+++ b/res/layouts/pages/content.xml
@@ -1,12 +1,12 @@
-<container size='767,454' color='#0F1E2DB2' padding='8' interval='5' context='menu'>
-    <panel id='packs_cur' pos='2' size='380,406' color='0' max-length='406'>
+<container size='887,454' color='#0F1E2DB2' padding='8' interval='5' context='menu'>
+    <panel id='packs_cur' pos='2' size='440,406' color='0' max-length='406'>
         <!-- content is generated in script -->
     </panel>
-    <panel id='packs_add' pos='385,2' size='380,406' color='0' max-length='406'>
+    <panel id='packs_add' pos='445,2' size='440,406' color='0' max-length='406'>
         <!-- content is generated in script -->
     </panel>
-    <button id='apply_btn' pos='2,410' size='380,40' onclick='apply()'>@Apply</button>
-    <button pos='385,410' size='338,40' onclick='menu:back()'>@Cancel</button>
+    <button id='apply_btn' pos='2,410' size='440,40' onclick='apply()'>@Apply</button>
+    <button pos='445,410' size='398,40' onclick='menu:back()'>@Cancel</button>
     <image onclick='refresh()' interactive='true' src='gui/refresh' 
         size='32' margin='7' gravity='bottom-right'
         color='#FFFFFF80' hover-color='#FFFFFF10'/>
diff --git a/res/layouts/templates/pack.xml b/res/layouts/templates/pack.xml
index 3978a6c7..ffb94518 100644
--- a/res/layouts/templates/pack.xml
+++ b/res/layouts/templates/pack.xml
@@ -1,4 +1,4 @@
-<container id='pack_%{id}' onclick='%{callback}' size='540,80' color='#00000040' hover-color='#00000080' z-index="%{index}">
+<container id='pack_%{id}' onclick='%{callback}' size='0,80' color='#00000040' hover-color='#00000080' z-index="%{index}">
     <label color='#FFFFFF80' size='300,25' align='right' gravity='top-right'>
         [%{id_verbose}]
     </label>
@@ -7,8 +7,8 @@
            gravity='bottom-right'>
         %{creator}
     </label>
-    <label if='%{error}' pos='80,28' size='290,50' multiline='true' color='#FF4040'>%{error}</label>
-    <label pos='80,28' color='#FFFFFFB2'>
+    <label if='%{error}' pos='80,28' size='355,50' multiline='true' color='#FF4040'>%{error}</label>
+    <label pos='80,28' size='355,50' multiline='true' color='#FFFFFFB2'>
         %{description}
     </label>
     <image pos='8,8' src='%{icon}' size='64'/>
diff --git a/src/graphics/ui/elements/Label.cpp b/src/graphics/ui/elements/Label.cpp
index a3b485cd..0ccf5b59 100644
--- a/src/graphics/ui/elements/Label.cpp
+++ b/src/graphics/ui/elements/Label.cpp
@@ -162,24 +162,14 @@ void Label::draw(const DrawContext* pctx, Assets* assets) {
 
     glm::vec2 pos = calcPos();
     switch (align) {
-        case Align::left:
-            break;
-        case Align::center:
-            pos.x += (size.x-newsize.x)*0.5f;
-            break;
-        case Align::right:
-            pos.x += size.x-newsize.x;
-            break;
+        case Align::left: break;
+        case Align::center: pos.x += (size.x-newsize.x)*0.5f; break;
+        case Align::right: pos.x += size.x-newsize.x; break;
     }
     switch (valign) {
-        case Align::top:
-            break;
-        case Align::center:
-            pos.y += (size.y-newsize.y)*0.5f;
-            break;
-        case Align::bottom:
-            pos.y += size.y-newsize.y;
-            break;
+        case Align::top: break;
+        case Align::center: pos.y += (size.y-newsize.y)*0.5f; break;
+        case Align::bottom: pos.y += size.y-newsize.y; break;
     }
     textYOffset = pos.y-calcPos().y;
     totalLineHeight = lineHeight;
diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp
index 46611073..6f2d572b 100644
--- a/src/graphics/ui/gui_xml.cpp
+++ b/src/graphics/ui/gui_xml.cpp
@@ -222,6 +222,9 @@ static std::shared_ptr<UINode> readLabel(UiXmlReader& reader, xml::xmlelement el
     }
     if (element->has("multiline")) {
         label->setMultiline(element->attr("multiline").asBool());
+        if (!element->has("valign")) {
+            label->setVerticalAlign(Align::top);
+        }
     }
     if (element->has("text-wrap")) {
         label->setTextWrapping(element->attr("text-wrap").asBool());
diff --git a/src/logic/scripting/lua/LuaState.cpp b/src/logic/scripting/lua/LuaState.cpp
index adabb6af..7d877aca 100644
--- a/src/logic/scripting/lua/LuaState.cpp
+++ b/src/logic/scripting/lua/LuaState.cpp
@@ -437,7 +437,6 @@ void lua::LuaState::removeEnvironment(int id) {
     }
     lua_pushnil(L);
     setglobal(envName(id));
-    logger.debug() << "removed environment " << envName(id);
 }
 
 bool lua::LuaState::emit_event(const std::string &name, std::function<int(lua::LuaState *)> args) {