labels use half the bevel width for text

[chaz/openbox] / otk / focuslabel.cc

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index ea5ecfc23ad2aea2b089f710cf2ab3f2e5ce9065..50b473d89c8ad2c8d64eb7455d7decac9e7499e6 100644 (file)
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -1,16 +1,29 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "focuslabel.hh"
+#include "display.hh"
+#include "screeninfo.hh"
 
 namespace otk {
 
 OtkFocusLabel::OtkFocusLabel(OtkWidget *parent)
-  : OtkFocusWidget(parent), _text(""), _dirty(false)
+  : OtkFocusWidget(parent), _text("")
 {
+  const ScreenInfo *info = OBDisplay::screenInfo(getScreen());
+  _xftdraw = XftDrawCreate(OBDisplay::display, getWindow(), info->getVisual(),
+                           info->getColormap());
+  
   setTexture(getStyle()->getLabelFocus());
   setUnfocusTexture(getStyle()->getLabelUnfocus());
 }
 
 OtkFocusLabel::~OtkFocusLabel()
 {
+  XftDrawDestroy(_xftdraw);
 }
 
 void OtkFocusLabel::update(void)
@@ -19,13 +32,13 @@ void OtkFocusLabel::update(void)
     const BFont &ft = getStyle()->getFont();
     BColor *text_color = (isFocused() ? getStyle()->getTextFocus()
                           : getStyle()->getTextUnfocus());
-    unsigned int bevel = getStyle()->getBevelWidth();
+    unsigned int bevel = getStyle()->getBevelWidth() / 2;
 
     std::string t = _text; // the actual text to draw
     int x = bevel;         // 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() - bevel * 2;
     if (max_length <= 0) {
       t = ""; // can't fit anything
     } else {
@@ -52,24 +65,9 @@ void OtkFocusLabel::update(void)
 
     OtkFocusWidget::update();
 
-    ft.drawString(getWindow(), x, bevel, *text_color, t);
+    ft.drawString(_xftdraw, x, bevel, *text_color, t);
   } else
     OtkFocusWidget::update();
-
-  _dirty = false;
-}
-
-int OtkFocusLabel::exposeHandler(const XExposeEvent &e)
-{
-  _dirty = true;
-  return OtkFocusWidget::exposeHandler(e);
-}
-
-int OtkFocusLabel::configureHandler(const XConfigureEvent &e)
-{
-  if (!(e.width == width() && e.height == height()))
-    _dirty = true;
-  return OtkFocusWidget::configureHandler(e);
 }
 
 }