Ticket #723: multiline-center-2.patch

source/gui/CGUI.cpp

@@ -810 +810 @@
             //  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
@@ -832 +833 @@
                 // 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 = ((width_range[To] - width_range[From]) - line_width) / 2;
             // Reset x once more
             x = width_range[From];
             // Move down, because font drawing starts from the baseline
@@ -862 +866 @@
                 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

@@ -106 +106 @@
     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;
-    }
+    TextPos.x = ObjSize.left;
 
     switch (valign)
     {