enforce a min size

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index 6d7d5c314cf6d12a21bf7e402e5ccfe1c6ec5c90..8ac328e7122d639a892f359fb789ef3de78cd066 100644 (file)
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -51,7 +51,15 @@ void FocusLabel::update()
       w = ft->measureString(_text) + sidemargin * 2;
     if (!_fixed_height)
       h = ft->height();
-    internalResize(w, h);
+
+    // enforce a minimum size
+    if (w > _rect.width()) {
+      if (h > _rect.height())
+        internalResize(w, h);
+      else
+        internalResize(w, _rect.height());
+    } else
+      internalResize(_rect.width(), h);
   }
   FocusWidget::update();
 }

diff --git a/otk/label.cc b/otk/label.cc
index fa5fefff2484666b9f02f23d121a4f152e5f412e..8352fb7a9b82eced7d43520344a0b62632a44810 100644 (file)
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -47,7 +47,15 @@ void Label::update()
       w = ft->measureString(_text) + sidemargin * 2;
     if (!_fixed_height)
       h = ft->height();
-    internalResize(w, h);
+
+    // enforce a minimum size
+    if (w > _rect.width()) {
+      if (h > _rect.height())
+        internalResize(w, h);
+      else
+        internalResize(w, _rect.height());
+    } else
+      internalResize(_rect.width(), h);
   }
   Widget::update();
 }