X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Flabel.cc;h=fa12a0fa2f2fdb8226161f2bb0fb12ba9503041f;hb=4e0b5fdef451c605f563d137b024134a68c6d6de;hp=24cf84028ea0f5f31dc261dd0896bd75e79384d7;hpb=646a10bcc38ac84933f4bca34dc442a062cc95ee;p=chaz%2Fopenbox

diff --git a/otk/label.cc b/otk/label.cc
index 24cf8402..fa12a0fa 100644
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -15,7 +15,7 @@ OtkLabel::OtkLabel(OtkWidget *parent)
   _xftdraw = XftDrawCreate(OBDisplay::display, getWindow(), info->getVisual(),
                            info->getColormap());
   
-  setTexture(getStyle()->getLabelUnfocus());
+  setStyle(getStyle());
 }
 
 OtkLabel::~OtkLabel()
@@ -23,17 +23,25 @@ OtkLabel::~OtkLabel()
   XftDrawDestroy(_xftdraw);
 }
 
+void OtkLabel::setStyle(Style *style)
+{
+  OtkWidget::setStyle(style);
+
+  setTexture(getStyle()->getLabelUnfocus());
+}
+
+
 void OtkLabel::update(void)
 {
   if (_dirty) {
     const BFont &ft = getStyle()->getFont();
-    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 {
@@ -60,7 +68,7 @@ void OtkLabel::update(void)
 
     OtkWidget::update();
 
-    ft.drawString(_xftdraw, x, bevel, *getStyle()->getTextUnfocus(), t);
+    ft.drawString(_xftdraw, x, 0, *getStyle()->getTextUnfocus(), t);
   } else
     OtkWidget::update();
 }