add an OBBackgroundWidget and use it for setting colors so far.

[chaz/openbox] / otk / focuslabel.cc

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index 234aca04c8396a18bdb4ec7247f2430fb20a1099..c4f124e682d1d989fd459f17ac592e9907a6675c 100644 (file)
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -16,7 +16,6 @@ OtkFocusLabel::OtkFocusLabel(OtkWidget *parent)
   const ScreenInfo *info = OBDisplay::screenInfo(getScreen());
   _xftdraw = XftDrawCreate(OBDisplay::display, getWindow(), info->getVisual(),
                            info->getColormap());
-  setStyle(getStyle());
 }
 
 OtkFocusLabel::~OtkFocusLabel()
@@ -40,13 +39,13 @@ void OtkFocusLabel::update(void)
     const BFont &ft = getStyle()->getFont();
     BColor *text_color = (isFocused() ? getStyle()->getTextFocus()
                           : getStyle()->getTextUnfocus());
-    unsigned int bevel = getStyle()->getBevelWidth() / 2;
+    unsigned int sidemargin = getStyle()->getBevelWidth() * 2;
 
     std::string t = _text; // the actual text to draw
-    int x = bevel;         // x coord for the text
+    int x = sidemargin;    // x coord for the text
 
     // find a string that will fit inside the area for text
-    int max_length = width() - bevel * 2;
+    int max_length = width() - sidemargin * 2;
     if (max_length <= 0) {
       t = ""; // can't fit anything
     } else {
@@ -73,7 +72,7 @@ void OtkFocusLabel::update(void)
 
     OtkFocusWidget::update();
 
-    ft.drawString(_xftdraw, x, bevel, *text_color, t);
+    ft.drawString(_xftdraw, x, 0, *text_color, t);
   } else
     OtkFocusWidget::update();
 }