compress motion events better

[chaz/openbox] / otk / label.cc

diff --git a/otk/label.cc b/otk/label.cc
index fa5fefff2484666b9f02f23d121a4f152e5f412e..16bfd5f47cf9cf49d323b2cac2ee6d4a0d655497 100644 (file)
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -33,8 +33,8 @@ void Label::fitString(const std::string &str)
 
 void Label::fitSize(int w, int h)
 {
-  unsigned int sidemargin = style()->bevelWidth() * 2;
-  resize(w + sidemargin * 2, h);
+  unsigned int sidemargin = _bevel_width * 2;
+  resize(w + sidemargin * 2, h + _bevel_width * 2);
 }
 
 void Label::update()
@@ -42,12 +42,20 @@ void Label::update()
   if (_dirty) {
     int w = _rect.width(), h = _rect.height();
     const Font *ft = style()->labelFont();
-    unsigned int sidemargin = style()->bevelWidth() * 2;
+    unsigned int sidemargin = _bevel_width * 2;
     if (!_fixed_width)
       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 if (h > _rect.height())
+      internalResize(_rect.width(), h);
   }
   Widget::update();
 }
@@ -58,7 +66,7 @@ void Label::renderForeground(void)
   Widget::renderForeground();
 
   const Font *ft = style()->labelFont();
-  unsigned int sidemargin = style()->bevelWidth() * 2;
+  unsigned int sidemargin = _bevel_width * 2;
 
   ustring t = _text; // the actual text to draw
   int x = sidemargin;    // x coord for the text
@@ -90,7 +98,7 @@ void Label::renderForeground(void)
   }
 
   display->renderControl(_screen)->
-    drawString(*_surface, *ft, x, 0, *style()->textUnfocusColor(), t);
+    drawString(*_surface, *ft, x, _bevel_width, *style()->textUnfocusColor(), t);
 }
 
 }