Common: GUIButton supports wrapping text

Author: ivan-mogilko

Common/gui/guibutton.cpp

@@ -168,7 +168,11 @@ Rect GUIButton::CalcGraphicRect(bool clipped)
             frame.Left++;
             frame.Top++;
         }
-        rc = SumRects(rc, GUI::CalcTextGraphicalRect(_textToDraw, Font, frame, TextAlignment));
+
+        Rect text_rc = IsWrapText() ?
+            GUI::CalcTextGraphicalRect(Lines.GetVector(), Lines.Count(), Font, get_font_linespacing(Font), frame, TextAlignment) :
+            GUI::CalcTextGraphicalRect(_textToDraw, Font, frame, TextAlignment);
+        rc = SumRects(rc, text_rc);
     }
     return rc;
 }
@@ -275,6 +279,15 @@ void GUIButton::SetText(const String &text)
     MarkChanged();
 }
 
+void GUIButton::SetWrapText(bool on)
+{
+    if (on != ((Flags & kGUICtrl_WrapText) != 0))
+    {
+        Flags = (Flags & ~kGUICtrl_WrapText) | kGUICtrl_WrapText * on;
+        MarkChanged();
+    }
+}
+
 bool GUIButton::OnMouseDown()
 {
     if (!IsImageButton())
@@ -502,7 +515,12 @@ void GUIButton::DrawText(Bitmap *ds, int x, int y, bool draw_disabled)
     color_t text_color = ds->GetCompatibleColor(TextColor);
     if (draw_disabled)
         text_color = ds->GetCompatibleColor(8);
-    GUI::DrawTextAligned(ds, _textToDraw, Font, text_color, frame, TextAlignment);
+
+    if (IsWrapText())
+        GUI::DrawTextLinesAligned(ds, Lines.GetVector(), Lines.Count(), Font, get_font_linespacing(Font), text_color,
+            frame, TextAlignment);
+    else
+        GUI::DrawTextAligned(ds, _textToDraw, Font, text_color, frame, TextAlignment);
 }
 
 void GUIButton::DrawTextButton(Bitmap *ds, int x, int y, bool draw_disabled)

Common/gui/guibutton.h

@@ -88,6 +88,7 @@ class GUIButton : public GUIObject
     void SetPushedImage(int32_t image);
     void SetImages(int32_t normal, int32_t over, int32_t pushed);
     void SetText(const String &text);
+    void SetWrapText(bool on);
 
     // Events
     bool OnMouseDown() override;

Common/gui/guidefines.h

@@ -139,6 +139,7 @@ enum GUIControlFlags
     kGUICtrl_Clip       = 0x0020, // only button
     kGUICtrl_Clickable  = 0x0040,
     kGUICtrl_Translated = 0x0080, // 3.3.0.1132
+    kGUICtrl_WrapText   = 0x0100, // 3.6.2
     kGUICtrl_Deleted    = 0x8000, // unused (probably remains from the old editor?)
 
     kGUICtrl_DefFlags   = kGUICtrl_Enabled | kGUICtrl_Visible | kGUICtrl_Clickable |

Common/gui/guiobject.h

@@ -51,6 +51,7 @@ class GUIObject
     bool            IsEnabled() const { return (Flags & kGUICtrl_Enabled) != 0; }
     bool            IsTranslated() const { return (Flags & kGUICtrl_Translated) != 0; }
     bool            IsVisible() const { return (Flags & kGUICtrl_Visible) != 0; }
+    bool            IsWrapText() const { return (Flags & kGUICtrl_WrapText) != 0; }
     // overridable routine to determine whether the mouse is over the control
     virtual bool    IsOverControl(int x, int y, int leeway) const;
     Size            GetSize() const { return Size(_width, _height); }

Engine/gui/gui_engine.cpp

@@ -187,8 +187,16 @@ void GUIListBox::PrepareTextToDraw(const String &text)
 
 void GUIButton::PrepareTextToDraw()
 {
-    _textToDraw = GUI::TransformTextForDrawing(_text, (Flags & kGUICtrl_Translated) != 0,
-        (loaded_game_file_version >= kGameVersion_361));
+    if (IsWrapText())
+    {
+        _textToDraw = _text;
+        GUI::SplitLinesForDrawing(_text, (Flags & kGUICtrl_Translated) != 0, Lines, Font, _width);
+    }
+    else
+    {
+        _textToDraw = GUI::TransformTextForDrawing(_text, (Flags & kGUICtrl_Translated) != 0,
+            (loaded_game_file_version >= kGameVersion_361));
+    }
 }
 
 } // namespace Common