X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffocuslabel.cc;h=bd74aa94fde064de2addd49ffb3545276d41a89b;hb=a612136ba51c87014e4fba0167aad77bbfdaa753;hp=6d034794a3973d20847688ab2f5174a085d9c5bf;hpb=5de751b104a25971a5f3c52feeadfd406bedce48;p=chaz%2Fopenbox

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index 6d034794..bd74aa94 100644
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -29,10 +29,45 @@ void FocusLabel::setStyle(RenderStyle *style)
   setUnfocusTexture(style->labelUnfocusBackground());
 }
 
+void FocusLabel::fitString(const std::string &str)
+{
+  const Font *ft = style()->labelFont();
+  fitSize(ft->measureString(str), ft->height());
+}
+
+void FocusLabel::fitSize(int w, int h)
+{
+  unsigned int sidemargin = style()->bevelWidth() * 2;
+  resize(w + sidemargin * 2, h);
+}
+
+void FocusLabel::update()
+{
+  if (_dirty) {
+    int w = _rect.width(), h = _rect.height();
+    const Font *ft = style()->labelFont();
+    unsigned int sidemargin = style()->bevelWidth() * 2;
+    if (!_fixed_width)
+      w = ft->measureString(_text) + sidemargin * 2;
+    if (!_fixed_height)
+      h = ft->height();
+
+    // 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);
+  }
+  FocusWidget::update();
+}
+
 
 void FocusLabel::renderForeground()
 {
-  otk::Widget::renderForeground();
+  FocusWidget::renderForeground();
 
   const Font *ft = style()->labelFont();
   RenderColor *text_color = (isFocused() ? style()->textFocusColor()