X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Flabel.cc;h=16bfd5f47cf9cf49d323b2cac2ee6d4a0d655497;hb=5072931be0ff28cd9447926d50fe5ea202e2c370;hp=bbc8a6b7ae3e04f16f2d6a8105f1eae257f1230f;hpb=723739dafe91a156fef527f3b53a483195695cf1;p=chaz%2Fopenbox

diff --git a/otk/label.cc b/otk/label.cc
index bbc8a6b7..16bfd5f4 100644
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -8,67 +8,97 @@
 
 namespace otk {
 
-OtkLabel::OtkLabel(OtkWidget *parent)
-  : OtkWidget(parent), _text("")
+Label::Label(Widget *parent)
+  : Widget(parent), _text("")
 {
-  const ScreenInfo *info = OBDisplay::screenInfo(screen());
-  _xftdraw = XftDrawCreate(OBDisplay::display, window(), info->getVisual(),
-                           info->getColormap());
+  setStyle(_style);
 }
 
-OtkLabel::~OtkLabel()
+Label::~Label()
 {
-  XftDrawDestroy(_xftdraw);
 }
 
-void OtkLabel::setStyle(Style *style)
+void Label::setStyle(RenderStyle *style)
 {
-  OtkWidget::setStyle(style);
+  Widget::setStyle(style);
 
-  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 = _bevel_width * 2;
+  resize(w + sidemargin * 2, h + _bevel_width * 2);
+}
 
-void OtkLabel::update(void)
+void Label::update()
 {
   if (_dirty) {
-    const BFont &ft = style()->getFont();
-    unsigned int sidemargin = style()->getBevelWidth() * 2;
-
-    std::string t = _text; // the actual text to draw
-    int x = sidemargin;    // x coord for the text
-
-    // find a string that will fit inside the area for text
-    int max_length = width() - sidemargin * 2;
-    if (max_length <= 0) {
-      t = ""; // can't fit anything
-    } else {
-      size_t text_len = t.size();
-      int length;
+    int w = _rect.width(), h = _rect.height();
+    const Font *ft = style()->labelFont();
+    unsigned int sidemargin = _bevel_width * 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);
+  }
+  Widget::update();
+}
+
+
+void Label::renderForeground(void)
+{
+  Widget::renderForeground();
+
+  const Font *ft = style()->labelFont();
+  unsigned int sidemargin = _bevel_width * 2;
+
+  ustring t = _text; // the actual text to draw
+  int x = sidemargin;    // x coord for the text
+
+  // find a string that will fit inside the area for text
+  int max_length = width() - sidemargin * 2;
+  if (max_length <= 0) {
+    t = ""; // can't fit anything
+  } else {
+    size_t text_len = t.size();
+    int length;
       
-      do {
-        t.resize(text_len);
-        length = ft.measureString(t);
-      } while (length > max_length && text_len-- > 0);
-
-      // justify the text
-      switch (style()->textJustify()) {
-      case Style::RightJustify:
-        x += max_length - length;
-        break;
-      case Style::CenterJustify:
-        x += (max_length - length) / 2;
-        break;
-      case Style::LeftJustify:
-        break;
-      }
-    }
+    do {
+      t.resize(text_len);
+      length = ft->measureString(t);
+    } while (length > max_length && text_len-- > 0);
 
-    OtkWidget::update();
+    // justify the text
+    switch (style()->labelTextJustify()) {
+    case RenderStyle::RightJustify:
+      x += max_length - length;
+      break;
+    case RenderStyle::CenterJustify:
+      x += (max_length - length) / 2;
+      break;
+    case RenderStyle::LeftJustify:
+      break;
+    }
+  }
 
-    ft.drawString(_xftdraw, x, 0, *style()->getTextUnfocus(), t);
-  } else
-    OtkWidget::update();
+  display->renderControl(_screen)->
+    drawString(*_surface, *ft, x, _bevel_width, *style()->textUnfocusColor(), t);
 }
 
 }