add a Label class that doesnt change with focus

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 8637f46ac7ea0324b6274fc8ff484824a9998c55..b35b7d9a00483fc930b0552e4a56a6f8908b7423 100644 (file)
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -9,7 +9,7 @@ libotk_a_SOURCES= color.cc display.cc font.cc gccache.cc image.cc \
                   texture.cc timer.cc timerqueuemanager.cc style.cc \
                   configuration.cc util.cc widget.cc focuswidget.cc \
                   button.cc eventhandler.cc eventdispatcher.cc \
-                  focuslabel.cc application.cc
+                  label.cc focuslabel.cc application.cc
 
 MAINTAINERCLEANFILES= Makefile.in
 

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index 98fe541718338764dac073a797920df9ad9624d4..ea5ecfc23ad2aea2b089f710cf2ab3f2e5ce9065 100644 (file)
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -1,4 +1,3 @@
-#include <iostream>
 #include "focuslabel.hh"
 
 namespace otk {

diff --git a/otk/label.cc b/otk/label.cc
new file mode 100644 (file)
index 0000000..5f2b22e
--- /dev/null
+++ b/otk/label.cc
@@ -0,0 +1,72 @@
+#include "label.hh"
+
+namespace otk {
+
+OtkLabel::OtkLabel(OtkWidget *parent)
+  : OtkWidget(parent), _text(""), _dirty(false)
+{
+  setTexture(getStyle()->getLabelUnfocus());
+}
+
+OtkLabel::~OtkLabel()
+{
+}
+
+void OtkLabel::update(void)
+{
+  if (_dirty) {
+    const BFont &ft = getStyle()->getFont();
+    unsigned int bevel = getStyle()->getBevelWidth();
+
+    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;
+    if (max_length <= 0) {
+      t = ""; // can't fit anything
+    } else {
+      size_t text_len = t.size();
+      int length;
+      
+      do {
+        t.resize(text_len);
+        length = ft.measureString(t);
+      } while (length > max_length && text_len-- > 0);
+
+      // justify the text
+      switch (getStyle()->textJustify()) {
+      case Style::RightJustify:
+        x += max_length - length;
+        break;
+      case Style::CenterJustify:
+        x += (max_length - length) / 2;
+        break;
+      case Style::LeftJustify:
+        break;
+      }
+    }
+
+    OtkWidget::update();
+
+    ft.drawString(getWindow(), x, bevel, *getStyle()->getTextUnfocus(), t);
+  } else
+    OtkWidget::update();
+
+  _dirty = false;
+}
+
+int OtkLabel::exposeHandler(const XExposeEvent &e)
+{
+  _dirty = true;
+  return OtkWidget::exposeHandler(e);
+}
+
+int OtkLabel::configureHandler(const XConfigureEvent &e)
+{
+  if (!(e.width == width() && e.height == height()))
+    _dirty = true;
+  return OtkWidget::configureHandler(e);
+}
+
+}

diff --git a/otk/label.hh b/otk/label.hh
new file mode 100644 (file)
index 0000000..3bf397a
--- /dev/null
+++ b/otk/label.hh
@@ -0,0 +1,30 @@
+#ifndef __label_hh
+#define __label_hh
+
+#include "widget.hh"
+
+namespace otk {
+
+class OtkLabel : public OtkWidget {
+
+public:
+
+  OtkLabel(OtkWidget *parent);
+  ~OtkLabel();
+
+  inline const std::string &getText(void) const { return _text; }
+  void setText(const std::string &text) { _text = text; _dirty = true; }
+
+  void update(void);
+  int exposeHandler(const XExposeEvent &e);
+  int configureHandler(const XConfigureEvent &e);
+
+private:
+
+  std::string _text;
+  bool _dirty;
+};
+
+}
+
+#endif