start of new render code

[chaz/openbox] / otk / label.cc

diff --git a/otk/label.cc b/otk/label.cc
index 24cf84028ea0f5f31dc261dd0896bd75e79384d7..da9edfd179708c591b30b6fbbe2e6f4ff6ceed59 100644 (file)
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -8,32 +8,38 @@
 
 namespace otk {
 
-OtkLabel::OtkLabel(OtkWidget *parent)
-  : OtkWidget(parent), _text("")
+Label::Label(Widget *parent)
+  : Widget(parent), _text("")
 {
-  const ScreenInfo *info = OBDisplay::screenInfo(getScreen());
-  _xftdraw = XftDrawCreate(OBDisplay::display, getWindow(), info->getVisual(),
-                           info->getColormap());
-  
-  setTexture(getStyle()->getLabelUnfocus());
+  const ScreenInfo *info = display->screenInfo(screen());
+  _xftdraw = XftDrawCreate(**display, window(), info->visual(),
+                           info->colormap());
 }
 
-OtkLabel::~OtkLabel()
+Label::~Label()
 {
   XftDrawDestroy(_xftdraw);
 }
 
-void OtkLabel::update(void)
+void Label::setStyle(Style *style)
+{
+  Widget::setStyle(style);
+
+  setTexture(style->getLabelUnfocus());
+}
+
+
+void Label::update(void)
 {
   if (_dirty) {
-    const BFont &ft = getStyle()->getFont();
-    unsigned int bevel = getStyle()->getBevelWidth() / 2;
+    const Font *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
+    ustring t = _text; // the actual text to draw
+    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 {
@@ -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;
@@ -58,11 +64,11 @@ void OtkLabel::update(void)
       }
     }
 
-    OtkWidget::update();
+    Widget::update();
 
-    ft.drawString(_xftdraw, x, bevel, *getStyle()->getTextUnfocus(), t);
+    ft->drawString(_xftdraw, x, 0, *style()->getTextUnfocus(), t);
   } else
-    OtkWidget::update();
+    Widget::update();
 }
 
 }