X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Flabel.cc;h=8352fb7a9b82eced7d43520344a0b62632a44810;hb=b8735c759a0a638a1169089c310baf9de6414597;hp=b536451e0a4fbb3b295fda7c7e5796d785f3ffc9;hpb=68a6fce53badb38ba3dc387c4b5c86c02801f657;p=chaz%2Fopenbox

diff --git a/otk/label.cc b/otk/label.cc
index b536451e..8352fb7a 100644
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -11,25 +11,62 @@ namespace otk {
 Label::Label(Widget *parent)
   : Widget(parent), _text("")
 {
+  setStyle(_style);
 }
 
 Label::~Label()
 {
 }
 
-void Label::setStyle(Style *style)
+void Label::setStyle(RenderStyle *style)
 {
   Widget::setStyle(style);
 
-  // XXX: do this again
-  //setTexture(style->getLabelUnfocus());
+  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();
+
+    // 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();
 }
 
 
 void Label::renderForeground(void)
 {
-  const Font *ft = style()->getFont();
-  unsigned int sidemargin = style()->getBevelWidth() * 2;
+  Widget::renderForeground();
+
+  const Font *ft = style()->labelFont();
+  unsigned int sidemargin = style()->bevelWidth() * 2;
 
   ustring t = _text; // the actual text to draw
   int x = sidemargin;    // x coord for the text
@@ -48,20 +85,20 @@ void Label::renderForeground(void)
     } while (length > max_length && text_len-- > 0);
 
     // justify the text
-    switch (style()->textJustify()) {
-    case Style::RightJustify:
+    switch (style()->labelTextJustify()) {
+    case RenderStyle::RightJustify:
       x += max_length - length;
       break;
-    case Style::CenterJustify:
+    case RenderStyle::CenterJustify:
       x += (max_length - length) / 2;
       break;
-    case Style::LeftJustify:
+    case RenderStyle::LeftJustify:
       break;
     }
   }
 
   display->renderControl(_screen)->
-    drawString(*_surface, *ft, x, 0, *style()->getTextUnfocus(), t);
+    drawString(*_surface, *ft, x, 0, *style()->textUnfocusColor(), t);
 }
 
 }