api cleanups

[chaz/openbox] / otk / label.cc

diff --git a/otk/label.cc b/otk/label.cc
index 170974ac2d2c449ef072362cfdf06e7686db5092..bbc8a6b7ae3e04f16f2d6a8105f1eae257f1230f 100644 (file)
--- 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(),
+  const ScreenInfo *info = OBDisplay::screenInfo(screen());
+  _xftdraw = XftDrawCreate(OBDisplay::display, window(), info->getVisual(),
                            info->getColormap());
-  
-  setStyle(getStyle());
 }
 
 OtkLabel::~OtkLabel()
@@ -27,21 +25,21 @@ void OtkLabel::setStyle(Style *style)
 {
   OtkWidget::setStyle(style);
 
-  setTexture(getStyle()->getLabelUnfocus());
+  setTexture(style->getLabelUnfocus());
 }
 
 
 void OtkLabel::update(void)
 {
   if (_dirty) {
-    const BFont &ft = getStyle()->getFont();
-    unsigned int bevel = getStyle()->getBevelWidth() / 2;
+    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() - bevel * 2;
+    int max_length = width() - sidemargin * 2;
     if (max_length <= 0) {
       t = ""; // can't fit anything
     } else {
@@ -54,7 +52,7 @@ void OtkLabel::update(void)
       } while (length > max_length && text_len-- > 0);
 
       // justify the text
-      switch (getStyle()->textJustify()) {
+      switch (style()->textJustify()) {
       case Style::RightJustify:
         x += max_length - length;
         break;
@@ -68,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();
 }