4 files changed, 66 insertions, 2 deletions
diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index 6d034794..6d7d5c31 100644
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -29,10 +29,37 @@ 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();
+    internalResize(w, h);
+  }
+  FocusWidget::update();
+}
+
 
 void FocusLabel::renderForeground()
 {
-  otk::Widget::renderForeground();
+  FocusWidget::renderForeground();
 
   const Font *ft = style()->labelFont();
   RenderColor *text_color = (isFocused() ? style()->textFocusColor()
diff --git a/otk/focuslabel.hh b/otk/focuslabel.hh
index 8db444d3..c25ab29c 100644
--- a/otk/focuslabel.hh
+++ b/otk/focuslabel.hh
@@ -18,6 +18,11 @@ public:
 
   virtual void renderForeground();
 
+  virtual void update();
+
+  void fitString(const std::string &str);
+  void fitSize(int w, int h);
+
   virtual void setStyle(RenderStyle *style);
   
 private:
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;
diff --git a/otk/label.hh b/otk/label.hh
index e24858f1..9c32e544 100644
--- a/otk/label.hh
+++ b/otk/label.hh
@@ -18,6 +18,11 @@ public:
 
   virtual void renderForeground(void);
 
+  virtual void update();
+
+  void fitString(const std::string &str);
+  void fitSize(int w, int h);
+
   virtual void setStyle(RenderStyle *style);
 
 private: