X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffocuslabel.cc;h=08f2af86823123792075b66f7f2209cbb79c49c6;hb=5face4c6f35172761367f63ac0b6eaf62d84e532;hp=c4f124e682d1d989fd459f17ac592e9907a6675c;hpb=70eb03ad50e1a71fd64c8cb1ebabbff311850553;p=chaz%2Fopenbox

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index c4f124e6..08f2af86 100644
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -10,71 +10,65 @@
 
 namespace otk {
 
-OtkFocusLabel::OtkFocusLabel(OtkWidget *parent)
-  : OtkFocusWidget(parent), _text("")
+FocusLabel::FocusLabel(Widget *parent)
+  : FocusWidget(parent), _text("")
 {
-  const ScreenInfo *info = OBDisplay::screenInfo(getScreen());
-  _xftdraw = XftDrawCreate(OBDisplay::display, getWindow(), info->getVisual(),
-                           info->getColormap());
 }
 
-OtkFocusLabel::~OtkFocusLabel()
+FocusLabel::~FocusLabel()
 {
-  XftDrawDestroy(_xftdraw);
 }
 
 
-void OtkFocusLabel::setStyle(Style *style)
+void FocusLabel::setStyle(RenderStyle *style)
 {
-  OtkFocusWidget::setStyle(style);
-  
-  setTexture(getStyle()->getLabelFocus());
-  setUnfocusTexture(getStyle()->getLabelUnfocus());
+  FocusWidget::setStyle(style);
+
+  setTexture(style->labelFocusBackground());
+  setUnfocusTexture(style->labelUnfocusBackground());
 }
 
 
-void OtkFocusLabel::update(void)
+void FocusLabel::renderForeground()
 {
-  if (_dirty) {
-    const BFont &ft = getStyle()->getFont();
-    BColor *text_color = (isFocused() ? getStyle()->getTextFocus()
-                          : getStyle()->getTextUnfocus());
-    unsigned int sidemargin = getStyle()->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;
+  otk::Widget::renderForeground();
+
+  const Font *ft = style()->labelFont();
+  RenderColor *text_color = (isFocused() ? style()->textFocusColor()
+                             : style()->textUnfocusColor());
+  unsigned int sidemargin = style()->bevelWidth() * 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 (getStyle()->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);
 
-    OtkFocusWidget::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, *text_color, t);
-  } else
-    OtkFocusWidget::update();
+  display->renderControl(_screen)->
+    drawString(*_surface, *ft, x, 0, *text_color, t);
 }
 
 }