X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Flabel.cc;h=fa5fefff2484666b9f02f23d121a4f152e5f412e;hb=41a03629c9f166f7a1b427ed1634b44c6c38da6e;hp=bb8083ab697ebf91e7f61d8bd0e1b8d67ec74878;hpb=9999922623158c296ce5485f7416103cdef863ca;p=chaz%2Fopenbox

diff --git a/otk/label.cc b/otk/label.cc
index bb8083ab..fa5fefff 100644
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -25,10 +25,37 @@ void Label::setStyle(RenderStyle *style)
   setTexture(style->labelUnfocusBackground());
 }
 
+void Label::fitString(const std::string &str)
+{
+  const Font *ft = style()->labelFont();
+  fitSize(ft->measureString(str), ft->height());
+}
+
+void Label::fitSize(int w, int h)
+{
+  unsigned int sidemargin = style()->bevelWidth() * 2;
+  resize(w + sidemargin * 2, h);
+}
+
+void Label::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();
+    internalResize(w, h);
+  }
+  Widget::update();
+}
+
 
 void Label::renderForeground(void)
 {
-  otk::Widget::renderForeground();
+  Widget::renderForeground();
 
   const Font *ft = style()->labelFont();
   unsigned int sidemargin = style()->bevelWidth() * 2;