Ticket #723: 0adTicket_723.patch

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

@@ -244 +244 @@
         dropdown_buffer="1"
         font="serif-bold-stroke-14"
         textcolor="white"
-        text_align="center"
+        text_align="left"
         text_valign="center"
 
         sprite="StoneButton"

source/gui/CGUI.cpp

@@ -665 +665 @@
     // Easier to read.
     bool WordWrapping = (Width != 0);
 
+    // get the alignment type for the control we are computing the text for since
+    // we are computing the horizontal alignment in this method in order to not have
+    // to run through the TextCalls a second time in the CalculateTextPosition method again
+    EAlign align;
+    GUI<EAlign>::GetSetting(pObject, "text_align", align);
+
     // Go through string word by word
     for (int i=0; i<(int)string.m_Words.size()-1 && !done; ++i)
     {
@@ -778 +784 @@
             // Reset X for the next loop
             x = width_range[From];
 
-            // Now we'll do another loop to figure out the height of
-            //  the line (the height of the largest character). This
+            // Now we'll do another loop to figure out the height and width of
+            //  the line (the height of the largest character and the width is
+            //  the sum of all of the individual widths). This
             //  couldn't be determined in the first loop (main loop)
             //  because it didn't regard images, so we don't know
             //  if all characters processed, will actually be involved
             //  in that line.
             float line_height=0.f;
+            float line_width=0.f;
             for (int j=temp_from; j<=i; ++j)
             {
                 // We don't want to use Feedback now, so we'll have to use
@@ -807 +815 @@
                 // Let line_height be the maximum m_Height we encounter.
                 line_height = std::max(line_height, Feedback2.m_Size.cy);
 
+                line_width += Feedback2.m_Size.cx;
+
                 if (WordWrapping && Feedback2.m_NewLine)
                     break;
             }
 
+            float dx = 0.f;
+            //compute offset based on what kind of alignment
+            switch (align)
+            {
+            case EAlign_Left:
+                //don't add an offset
+                dx = 0.f;
+                break;
+
+            case EAlign_Center:
+                dx = ((width_range[To] - width_range[From]) - line_width) / 2;
+                break;
+
+            case EAlign_Right:
+                dx = width_range[To] - line_width;
+                break;
+
+            default:
+                debug_warn(L"Broken EAlign in CGUI::GenerateText()");
+                break;
+            }
             // Reset x once more
             x = width_range[From];
             // Move down, because font drawing starts from the baseline
@@ -837 +868 @@
                 std::vector<SGUIText::STextCall>::iterator it;
                 for (it = Feedback2.m_TextCalls.begin(); it != Feedback2.m_TextCalls.end(); ++it)
                 {
-                    it->m_Pos = CPos(x + x_pointer, y);
+                    it->m_Pos = CPos(dx + x + x_pointer, y);
 
                     x_pointer += it->m_Size.cx;
 

source/gui/IGUITextOwner.cpp

@@ -100 +100 @@
 
 void IGUITextOwner::CalculateTextPosition(CRect &ObjSize, CPos &TextPos, SGUIText &Text)
 {
-    EAlign align;
     EVAlign valign;
-    GUI<EAlign>::GetSetting(this, "text_align", align);
     GUI<EVAlign>::GetSetting(this, "text_valign", valign);
 
-    switch (align)
-    {
-    case EAlign_Left:
-        TextPos.x = ObjSize.left;
-        break;
-    case EAlign_Center:
-        // Round to integer pixel values, else the fonts look awful
-        TextPos.x = floorf(ObjSize.CenterPoint().x - Text.m_Size.cx/2.f);
-        break;
-    case EAlign_Right:
-        TextPos.x = ObjSize.right - Text.m_Size.cx;
-        break;
-    default:
-        debug_warn(L"Broken EAlign in CButton::SetupText()");
-        break;
-    }
+    // The horizontal Alignment is now computed in GenerateText in order to not have to
+    // loop through all of the TextCall objects again.
+    TextPos.x = ObjSize.left;
 
     switch (valign)
     {

source/gui/CGUI.h

@@ -241 +241 @@
      * Generate a SGUIText object from the inputted string.
      * The function will break down the string and its
      * tags to calculate exactly which rendering queries
-     * will be sent to the Renderer.
+     * will be sent to the Renderer. Also, Horizontal Alignment
+     * is taken into acount in this method but NOT Vertical Alignment.
      *
      * Done through the CGUI since it can communicate with 
      *

source/gui/CTooltip.cpp

@@ -36 +36 @@
     AddSetting(GUIST_float,                 "maxwidth");
     AddSetting(GUIST_CPos,                  "offset");
     AddSetting(GUIST_EVAlign,               "anchor");
+    AddSetting(GUIST_EAlign,                "text_align");
     // This is used for tooltips that are hidden/revealed manually by scripts, rather than through the standard tooltip display mechanism
     AddSetting(GUIST_bool,                  "independent");
 
@@ -49 +50 @@
     // Defaults
     GUI<int>::SetSetting(this, "delay", 500);
     GUI<EVAlign>::SetSetting(this, "anchor", EVAlign_Bottom);
+    GUI<EAlign>::SetSetting(this, "text_align", EAlign_Left);
 
     // Set up a blank piece of text, to be replaced with a more
     // interesting message later