Ticket #4321: maxSize.patch

binaries/data/mods/mod/gui/common/modern/styles.xml

@@ -13 +13 @@
         ghost="false"
         hidden="false"
         size="0 0 100% 100%"
+        size_max="0 0 100% 100%"
         z="0"
         font="sans-14"
         buffer_zone="5"

binaries/data/mods/mod/gui/gui.rnc

@@ -43 +43 @@
   attribute ghost { bool }?&
   attribute hidden { bool }?&
   attribute size { clientarea }?&
+  attribute size_max { clientarea }?&
   attribute z { xsd:decimal }?
 # Defaults are not put in here, because it ruins the concept of styles.
 ex_settings =

binaries/data/mods/mod/gui/gui.rng

@@ -160 +160 @@
         </attribute>
       </optional>
       <optional>
+        <attribute name="size_max">
+          <ref name="clientarea"/>
+        </attribute>
+      </optional>
+      <optional>
         <attribute name="z">
           <data type="decimal"/>
         </attribute>

binaries/data/mods/public/gui/common/styles.xml

@@ -15 +15 @@
         ghost="false"
         hidden="false"
         size="0 0 100% 100%"
+        size_max="0 0 100% 100%"
         z="0"
 
         font="sans-14"

binaries/data/mods/public/gui/structree/draw.js

@@ -1 +1 @@
 var g_DrawLimits = {}; // GUI limits. Populated by predraw()
+var g_ContentWidth = 0;
 
 var g_TooltipFunctions = [
     getEntityNamesFormatted,
@@ -40 +41 @@
     Engine.GetGUIObjectByName("civHistory").caption = g_CivData[g_SelectedCiv].History;
 
     let i = 0;
+    g_ContentWidth = 0;
     for (let pha of phaseList)
     {
         let prodBarWidth = 0;
@@ -139 +141 @@
             hideRemaining("phase["+i+"]_struct["+s+"]_row[", r, "]");
             ++s;
             prodBarWidth += eleWidth + defMargin;
+            g_ContentWidth = Math.max(y, g_ContentWidth);
         }
         hideRemaining("phase["+i+"]_struct[", s, "]");
         let offset = getPositionOffset(i);
@@ -148 +151 @@
         {
             let prodBar = Engine.GetGUIObjectByName("phase["+i+"]_bar["+(j-1)+"]");
             let prodBarSize = prodBar.size;
-            prodBarSize.right = leftMargin + prodBarWidth;
+            prodBarSize.right = leftMargin + prodBarWidth + defMargin * 2;
             prodBar.size = prodBarSize;
         }
 
@@ -213 +216 @@
 
     let size = Engine.GetGUIObjectByName("display_tree").size;
     size.right = t > 0 ? -124 : -4;
+    g_ContentWidth += t > 0 ? 28 + defWidth : 4
     Engine.GetGUIObjectByName("display_tree").size = size;
 
     Engine.GetGUIObjectByName("display_trainers").hidden = t == 0;
+
+    g_ContentWidth += 96;
+    updatePageMaxWidth();
+}
+
+function updatePageMaxWidth()
+{
+    let page_maxsize = Engine.GetGUIObjectByName("structree_page").size_max;
+    let x = g_ContentWidth / 2;
+    page_maxsize.left = -x;
+    page_maxsize.right = x;
+    Engine.GetGUIObjectByName("structree_page").size_max = page_maxsize;
 }
 
 function drawProdIcon(pha, s, r, p, prod)
@@ -275 +291 @@
     let phaseList = g_ParsedData.phaseList;
     let initIconSize = Engine.GetGUIObjectByName("phase[0]_struct[0]_row[0]_prod[0]").size;
 
+    let page_maxsize = Engine.GetGUIObjectByName("structree_page").size_max;
+    page_maxsize.rleft = 50;
+    page_maxsize.rright = 50;
+    Engine.GetGUIObjectByName("structree_page").size_max = page_maxsize;
+
     let phaseCount = phaseList.length;
     let i = 0;
     for (let pha of phaseList)
@@ -353 +374 @@
     hideRemaining("phase[", i, "]");
     hideRemaining("phase[", i, "]_bar");
 
+    let page_size = Engine.GetGUIObjectByName("structree_page").size;
+    let offset = getPositionOffset(i) + 196;
+    page_size.top = -offset / 2;
+    page_size.bottom = offset / 2;
+    Engine.GetGUIObjectByName("structree_page").size = page_size;
+
     let t = 0;
     let ele = Engine.GetGUIObjectByName("trainer["+t+"]");
     g_DrawLimits.trainer = {

binaries/data/mods/public/gui/structree/structree.xml

@@ -13 +13 @@
     <!-- Add a translucent black background to fade out the menu page -->
     <object type="image" z="0" sprite="BackgroundTranslucent"/>
 
-    <object type="image" style="ModernDialog" size="16 24 100%-16 100%-24">
+    <object type="image" style="ModernDialog" size="16 50%-360 100%-16 50%+360" name="structree_page">
         <object style="TitleText" type="text" size="50%-128 -18 50%+128 14">
             <translatableAttribute id="caption">Structure Tree</translatableAttribute>
         </object>

source/gui/CTooltip.cpp

@@ -49 +49 @@
     GUI<int>::SetSetting(this, "delay", 500);
     GUI<EVAlign>::SetSetting(this, "anchor", EVAlign_Bottom);
     GUI<EAlign>::SetSetting(this, "text_align", EAlign_Left);
+    GUI<CClientArea>::SetSetting(this, "size_max", CClientArea("0 0 100% 100%"));
 
     // Set up a blank piece of text, to be replaced with a more
     // interesting message later

source/gui/GUIbase.cpp

@@ -52 +52 @@
     return client;
 }
 
+
+CRect CClientArea::GetClientArea(const CRect& parent, const CClientArea& maxLimit) const
+{
+    CRect limit = maxLimit.GetClientArea(parent);
+    CRect client = this->GetClientArea(parent);
+
+    // If no limit imposed, then we don't need to restrict
+    if (parent == limit)
+        return client;
+
+    client.left = std::max(client.left, limit.left);
+    client.top = std::max(client.top, limit.top);
+    client.right = std::min(client.right, limit.right);
+    client.bottom = std::min(client.bottom, limit.bottom);
+
+    return client;
+}
+
 bool CClientArea::SetClientArea(const CStr& Value)
 {
     /* ClientAreas contain a left, top, right, and bottom

source/gui/GUIbase.h

@@ -177 +177 @@
      * Get client area rectangle when the parent is given
      */
     CRect GetClientArea(const CRect& parent) const;
+    CRect GetClientArea(const CRect& parent, const CClientArea& maxLimit) const;
 
     /**
      * The ClientArea can be set from a string looking like:

source/gui/GUIutil.cpp

@@ -390 +390 @@
     //
 
     // If setting was "size", we need to re-cache itself and all children
-    if (Setting == "size")
+    if (Setting == "size" || Setting == "size_max")
     {
         RecurseObject(0, pObject, &IGUIObject::UpdateCachedSize);
     }

source/gui/IGUIObject.cpp

@@ -34 +34 @@
     AddSetting(GUIST_bool,          "enabled");
     AddSetting(GUIST_bool,          "hidden");
     AddSetting(GUIST_CClientArea,   "size");
+    AddSetting(GUIST_CClientArea,   "size_max");
     AddSetting(GUIST_CStr,          "style");
     AddSetting(GUIST_CStr,          "hotkey");
     AddSetting(GUIST_float,         "z");
@@ -307 +308 @@
     CClientArea ca;
     GUI<CClientArea>::GetSetting(this, "size", ca);
 
+    CClientArea ca_max;
+    GUI<CClientArea>::GetSetting(this, "size_max", ca_max);
+
     // If absolute="false" and the object has got a parent,
     //  use its cached size instead of the screen. Notice
     //  it must have just been cached for it to work.
     if (absolute == false && m_pParent && !IsRootObject())
-        m_CachedActualSize = ca.GetClientArea(m_pParent->m_CachedActualSize);
+        m_CachedActualSize = ca.GetClientArea(m_pParent->m_CachedActualSize, ca_max);
     else
-        m_CachedActualSize = ca.GetClientArea(CRect(0.f, 0.f, g_xres * g_GuiScale, g_yres * g_GuiScale));
+        m_CachedActualSize = ca.GetClientArea(CRect(0.f, 0.f, g_xres * g_GuiScale, g_yres * g_GuiScale), ca_max);
 
     // In a few cases, GUI objects have to resize to fill the screen
     // but maintain a constant aspect ratio.