From 4e6f98cfd788965bd382f1722e2a5d895dda3bc6 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 5 Oct 2013 20:26:59 +0300
Subject: Add support for min and max label resize size.

Using it in character selection dialog.
---
 src/gui/widgets/label.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/gui/widgets/label.cpp')

diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index d57268bdd..50bd3ad41 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -128,18 +128,18 @@ void Label::setForegroundColorAll(const gcn::Color &color1,
     mForegroundColor2 = color2;
 }
 
-void Label::resizeTo(const int sz)
+void Label::resizeTo(const int maxSize, const int minSize)
 {
     const gcn::Font *const font = getFont();
     const int pad2 = 2 * mPadding;
     setHeight(font->getHeight() + pad2);
 
-    if (font->getWidth(mCaption) + pad2 > sz)
+    if (font->getWidth(mCaption) + pad2 > maxSize)
     {
         const int dots = font->getWidth("...");
-        if (dots > sz)
+        if (dots > maxSize)
         {
-            setWidth(sz);
+            setWidth(maxSize);
             return;
         }
         const size_t szChars = mCaption.size();
@@ -147,17 +147,20 @@ void Label::resizeTo(const int sz)
         {
             const std::string text = mCaption.substr(0, szChars - f);
             const int width = font->getWidth(text) + dots + pad2;
-            if (width <= sz)
+            if (width <= maxSize)
             {
                 setCaption(text + "...");
                 setWidth(width);
                 return;
             }
         }
-        setWidth(sz);
+        setWidth(maxSize);
     }
     else
     {
-        setWidth(font->getWidth(mCaption) + pad2);
+        int sz = font->getWidth(mCaption) + pad2;
+        if (sz < minSize)
+            sz = minSize;
+        setWidth(sz);
     }
 }
-- 
cgit v1.2.3-60-g2f50