add an OBBackgroundWidget and use it for setting colors so far.

[chaz/openbox] / otk / label.cc

diff --git a/otk/label.cc b/otk/label.cc
index 1537b9277a514b736b75c8bf64e9ec949b021729..ceb6a49cc2a9cf7c082f585741f7d8b34d73deb8 100644 (file)
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -11,24 +11,35 @@ namespace otk {
 OtkLabel::OtkLabel(OtkWidget *parent)
   : OtkWidget(parent), _text("")
 {
-  setTexture(getStyle()->getLabelUnfocus());
+  const ScreenInfo *info = OBDisplay::screenInfo(getScreen());
+  _xftdraw = XftDrawCreate(OBDisplay::display, getWindow(), info->getVisual(),
+                           info->getColormap());
 }
 
 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();
+    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() - getBevelWidth() * 2;
+    int max_length = width() - sidemargin * 2;
     if (max_length <= 0) {
       t = ""; // can't fit anything
     } else {
@@ -55,7 +66,7 @@ void OtkLabel::update(void)
 
     OtkWidget::update();
 
-    ft.drawString(getWindow(), x, bevel, *getStyle()->getTextUnfocus(), t);
+    ft.drawString(_xftdraw, x, 0, *getStyle()->getTextUnfocus(), t);
   } else
     OtkWidget::update();
 }