X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Flabelwidget.cc;h=9ff45298a834f59a5bcc4f17c91169f217e33b5f;hb=77ab46d1e35d48e73c201e6de88b26f48bb06425;hp=9b18c0a97ec1c55499f39f4ef2cc4eb943a8a99f;hpb=83727b8e6404f7e00e7369c39da8779dfb85ae09;p=chaz%2Fopenbox

diff --git a/src/labelwidget.cc b/src/labelwidget.cc
index 9b18c0a9..9ff45298 100644
--- a/src/labelwidget.cc
+++ b/src/labelwidget.cc
@@ -1,40 +1,120 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef HAVE_CONFIG_H
 # include "../config.h"
 #endif
 
+#include "otk/screeninfo.hh"
+#include "otk/display.hh"
 #include "labelwidget.hh"
 
 namespace ob {
 
-OBLabelWidget::OBLabelWidget(otk::OtkWidget *parent, OBWidget::WidgetType type)
-  : otk::OtkFocusLabel(parent),
-    OBWidget(type)
+LabelWidget::LabelWidget(otk::Widget *parent, WidgetBase::WidgetType type)
+  : otk::Widget(parent),
+    WidgetBase(type)
+{
+  const otk::ScreenInfo *info = otk::Display::screenInfo(_screen);
+  _xftdraw = XftDrawCreate(otk::Display::display, _window, info->visual(),
+                           info->colormap());
+}
+
+
+LabelWidget::~LabelWidget()
 {
+  XftDrawDestroy(_xftdraw);
 }
 
 
-OBLabelWidget::~OBLabelWidget()
+void LabelWidget::setText(const std::string &text)
 {
+  _text = text;
+  _dirty = true;
 }
 
 
-void OBLabelWidget::setStyle(otk::Style *style)
+void LabelWidget::setTextures()
 {
-  setTexture(style->getLabelFocus());
-  setUnfocusTexture(style->getLabelUnfocus());
+  if (_focused) {
+    setTexture(_style->getLabelFocus());
+    _text_color = _style->getTextFocus();
+  } else {
+    setTexture(_style->getLabelUnfocus());
+    _text_color = _style->getTextUnfocus();
+  }
+}
 
-  otk::OtkFocusLabel::setStyle(style);
+
+void LabelWidget::setStyle(otk::Style *style)
+{
+  otk::Widget::setStyle(style);
+  setTextures();
+  _font = style->getFont();
+  assert(_font);
+  _sidemargin = style->getBevelWidth() * 2;
+  _justify = style->textJustify();
 }
 
 
-void OBLabelWidget::adjust()
+void LabelWidget::focus()
 {
-  otk::OtkFocusLabel::adjust();
+  otk::Widget::focus();
+  setTextures();
+}
 
-  // XXX: adjust shit
+
+void LabelWidget::unfocus()
+{
+  otk::Widget::unfocus();
+  setTextures();
 }
 
 
+void LabelWidget::update()
+{
+  bool draw = _dirty;
+
+  otk::Widget::update();
+
+  if (draw) {
+    std::string t = _text;
+    int x = _sidemargin;    // x coord for the text
+
+    // find a string that will fit inside the area for text
+    int max_length = width() - _sidemargin * 2;
+    if (max_length <= 0) {
+      t = ""; // can't fit anything
+    } else {
+      size_t text_len = t.size();
+      int length;
+      
+      do {
+        t.resize(text_len);
+        length = _font->measureString(t);
+      } while (length > max_length && text_len-- > 0);
+
+      // justify the text
+      switch (_justify) {
+      case otk::Style::RightJustify:
+        x += max_length - length;
+        break;
+      case otk::Style::CenterJustify:
+        x += (max_length - length) / 2;
+        break;
+      case otk::Style::LeftJustify:
+        break;
+      }
+    }
+
+    _font->drawString(_xftdraw, x, 0, *_text_color, t);
+  }
+}
+
+
+void LabelWidget::adjust()
+{
+  // nothing to adjust. no children.
+}
+
 }