X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Ffocuslabel.cc;h=6d034794a3973d20847688ab2f5174a085d9c5bf;hb=674f2609c22d68c5645da22f42ef858182e8b791;hp=79d68b092903f1f05fabc69036d82bf447a71a6c;hpb=d8d9b42777ace234f3471918e1210062578f8188;p=chaz%2Fopenbox

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index 79d68b09..6d034794 100644
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -13,6 +13,7 @@ namespace otk {
 FocusLabel::FocusLabel(Widget *parent)
   : FocusWidget(parent), _text("")
 {
+  setStyle(_style);
 }
 
 FocusLabel::~FocusLabel()
@@ -20,22 +21,23 @@ FocusLabel::~FocusLabel()
 }
 
 
-void FocusLabel::setStyle(Style *style)
+void FocusLabel::setStyle(RenderStyle *style)
 {
   FocusWidget::setStyle(style);
 
-  // XXX: do this again
-  //setTexture(style->getLabelFocus());
-  //setUnfocusTexture(style->getLabelUnfocus());
+  setTexture(style->labelFocusBackground());
+  setUnfocusTexture(style->labelUnfocusBackground());
 }
 
 
-void FocusLabel::renderForeground(void)
+void FocusLabel::renderForeground()
 {
-  const Font *ft = style()->getFont();
-  Color *text_color = (isFocused() ? style()->getTextFocus()
-                       : style()->getTextUnfocus());
-  unsigned int sidemargin = style()->getBevelWidth() * 2;
+  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
@@ -54,20 +56,20 @@ void FocusLabel::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, *text_color, t);
+    drawString(*_surface, *ft, x, 0, *text_color, t);
 }
 
 }