X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Flabel.cc;h=4a61efd078fca007c669a6c8b010b43da167c7a1;hb=2b2f81b93c89c2a2d6abc3b12dee66b8e2a0452d;hp=21811a2c43b20577fbfba90b06686a3a8a4b85d8;hpb=c6f228f3ff9ab7087669366a23d2ae61d8e5b9b9;p=chaz%2Fopenbox

diff --git a/otk/label.cc b/otk/label.cc
index 21811a2c..4a61efd0 100644
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -11,11 +11,9 @@ namespace otk {
 OtkLabel::OtkLabel(OtkWidget *parent)
   : OtkWidget(parent), _text("")
 {
-  const ScreenInfo *info = OBDisplay::screenInfo(getScreen());
-  _xftdraw = XftDrawCreate(OBDisplay::display, getWindow(), info->getVisual(),
-                           info->getColormap());
-  
-  setTexture(getStyle()->getLabelUnfocus());
+  const ScreenInfo *info = OBDisplay::screenInfo(screen());
+  _xftdraw = XftDrawCreate(OBDisplay::display, window(), info->visual(),
+                           info->colormap());
 }
 
 OtkLabel::~OtkLabel()
@@ -23,17 +21,25 @@ OtkLabel::~OtkLabel()
   XftDrawDestroy(_xftdraw);
 }
 
+void OtkLabel::setStyle(Style *style)
+{
+  OtkWidget::setStyle(style);
+
+  setTexture(style->getLabelUnfocus());
+}
+
+
 void OtkLabel::update(void)
 {
   if (_dirty) {
-    const BFont &ft = getStyle()->getFont();
-    unsigned int bevel = getStyle()->getBevelWidth();
+    const BFont *ft = style()->getFont();
+    unsigned int sidemargin = style()->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() - getBevelWidth() * 2;
+    int max_length = width() - sidemargin * 2;
     if (max_length <= 0) {
       t = ""; // can't fit anything
     } else {
@@ -42,11 +48,11 @@ void OtkLabel::update(void)
       
       do {
         t.resize(text_len);
-        length = ft.measureString(t);
+        length = ft->measureString(t);
       } while (length > max_length && text_len-- > 0);
 
       // justify the text
-      switch (getStyle()->textJustify()) {
+      switch (style()->textJustify()) {
       case Style::RightJustify:
         x += max_length - length;
         break;
@@ -60,7 +66,7 @@ void OtkLabel::update(void)
 
     OtkWidget::update();
 
-    ft.drawString(_xftdraw, x, bevel, *getStyle()->getTextUnfocus(), t);
+    ft->drawString(_xftdraw, x, 0, *style()->getTextUnfocus(), t);
   } else
     OtkWidget::update();
 }