X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffocuslabel.cc;h=a5c851273adb49c6ca171bc3d0bdeaf0fc4232cb;hb=e05d5f7934ce27893f900627fbd06b1679d4c0ad;hp=234aca04c8396a18bdb4ec7247f2430fb20a1099;hpb=26adc8853bc04f3f2f2d2e5f5ac94121f23b72e2;p=chaz%2Fopenbox

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index 234aca04..a5c85127 100644
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -13,10 +13,9 @@ namespace otk {
 OtkFocusLabel::OtkFocusLabel(OtkWidget *parent)
   : OtkFocusWidget(parent), _text("")
 {
-  const ScreenInfo *info = OBDisplay::screenInfo(getScreen());
-  _xftdraw = XftDrawCreate(OBDisplay::display, getWindow(), info->getVisual(),
-                           info->getColormap());
-  setStyle(getStyle());
+  const ScreenInfo *info = OBDisplay::screenInfo(screen());
+  _xftdraw = XftDrawCreate(OBDisplay::display, window(), info->visual(),
+                           info->colormap());
 }
 
 OtkFocusLabel::~OtkFocusLabel()
@@ -29,24 +28,24 @@ void OtkFocusLabel::setStyle(Style *style)
 {
   OtkFocusWidget::setStyle(style);
   
-  setTexture(getStyle()->getLabelFocus());
-  setUnfocusTexture(getStyle()->getLabelUnfocus());
+  setTexture(style->getLabelFocus());
+  setUnfocusTexture(style->getLabelUnfocus());
 }
 
 
 void OtkFocusLabel::update(void)
 {
   if (_dirty) {
-    const BFont &ft = getStyle()->getFont();
-    BColor *text_color = (isFocused() ? getStyle()->getTextFocus()
-                          : getStyle()->getTextUnfocus());
-    unsigned int bevel = getStyle()->getBevelWidth() / 2;
+    const BFont *ft = style()->getFont();
+    BColor *text_color = (isFocused() ? style()->getTextFocus()
+                          : style()->getTextUnfocus());
+    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 {
@@ -55,11 +54,11 @@ void OtkFocusLabel::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;
@@ -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();
 }