From 8baf5e927c50fc27fc0e1941597928d8734ac4b2 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sun, 25 Oct 2009 15:41:57 +0000
Subject: [PATCH] Remove the silly properties interface

---
 include/gui2/ILayout.hpp | 16 ----------------
 include/gui2/Label.hpp   |  2 --
 include/gui2/Widget.hpp  | 28 ++++------------------------
 layouts/demo.xml         |  4 ++--
 src/ft/Font.cpp          | 11 +++++++++++
 src/ft/IFont.hpp         |  1 +
 src/gui2/Button.cpp      |  5 +++--
 src/gui2/Label.cpp       |  6 +++---
 src/gui2/Widget.cpp      | 28 +++++++---------------------
 src/gui2/Window.cpp      |  5 +++--
 10 files changed, 34 insertions(+), 72 deletions(-)

diff --git a/include/gui2/ILayout.hpp b/include/gui2/ILayout.hpp
index f539ee2..cbd4cdc 100644
--- a/include/gui2/ILayout.hpp
+++ b/include/gui2/ILayout.hpp
@@ -29,25 +29,9 @@ namespace gui {
    // A generic UI element
    struct IWidget {
       virtual ~IWidget() {}
-
-      virtual boost::any get_property(const string& key) const = 0;
-      virtual void set_property(const string& key, boost::any value) = 0;
    };
 
    typedef shared_ptr<IWidget> IWidgetPtr;
-
-   template <typename T>
-   inline T get_property(IWidgetPtr elem, const string& key)
-   {
-      return boost::any_cast<T>(elem->get_property(key));
-   }
-
-   template <typename T>
-   inline void set_property(IWidgetPtr elem, const string& key,
-      const T& value)
-   {
-      elem->set_property(key, value);
-   }
    
    // A complete set of UI elements
    struct ILayout {
diff --git a/include/gui2/Label.hpp b/include/gui2/Label.hpp
index 5c5f1de..1b77cab 100644
--- a/include/gui2/Label.hpp
+++ b/include/gui2/Label.hpp
@@ -18,8 +18,6 @@
 #ifndef INC_GUI_LABEL_HPP
 #define INC_GUI_LABEL_HPP
 
-// Internal header: do not include this file directly
-
 #include "Platform.hpp"
 #include "gui2/Widget.hpp"
 
diff --git a/include/gui2/Widget.hpp b/include/gui2/Widget.hpp
index cce1161..1f7501d 100644
--- a/include/gui2/Widget.hpp
+++ b/include/gui2/Widget.hpp
@@ -28,8 +28,6 @@
 #include <string>
 #include <map>
 
-#include <boost/any.hpp>
-
 namespace gui {
 
    class Widget : public IWidget {
@@ -41,39 +39,21 @@ namespace gui {
       int y() const { return y_; }
       int width() const { return width_; }
       int height() const { return height_; }
+      
+      void width(int w) { width_ = w; }
+      void height(int h) { height_ = h; }
 
       boost::any get_property(const string& key) const;
       void set_property(const string& key, boost::any value);
 
       virtual void render(RenderContext& rc) const = 0;
 
-   protected:      
-      template <class T>
-      void const_property(const string& key, T& value,
-         const T& def = T())
-      {
-         value = tmp_attrs.get<T>(key, def);
-         read_properties[key] = value;
-      }
-
-      template <class T>
-      void property(const string& key, T& value, const T& def = T())
-      {
-         const_property(key, value);   // Readable as well
-         write_properties[key] = ref(value);
-      }
-      
    private:
       static string unique_name();
       
       string name_;
       int x_, y_, width_, height_;
-      
-      const AttributeSet& tmp_attrs;   // Do not use after initialisation
-      
-      typedef map<string, boost::any> PropertyMap;
-      PropertyMap read_properties, write_properties;
-
+            
       static int unique_id;
    };
  
diff --git a/layouts/demo.xml b/layouts/demo.xml
index a91e49d..c937243 100644
--- a/layouts/demo.xml
+++ b/layouts/demo.xml
@@ -5,7 +5,7 @@
     <button name="btn1" label="One"
             x="5" y="5" width="80" height="25" />
     <button name="btn2" label="Two"/>
-    <button label="abcdefghijklmnopqrstuvwxyz"
-           x="5" y="60" width="100" height="20"/>
+    <label text="abcdefghijklmnopqrstuvwxyz"
+           x="5" y="60" width="150" height="20"/>
   </window>
 </layout>
diff --git a/src/ft/Font.cpp b/src/ft/Font.cpp
index 8cd58a4..0f91639 100644
--- a/src/ft/Font.cpp
+++ b/src/ft/Font.cpp
@@ -191,6 +191,7 @@ public:
    void print(int x, int y, Colour c, const string& s) const;
 
    int height() const { return height_; }
+   int text_width(const string& s) const;
 private:
    FT_Face face;
    vector<Glyph*> glyphs;
@@ -266,6 +267,16 @@ void Font::print(int x, int y, Colour c, const string& s) const
    glPopAttrib();
 }
 
+int Font::text_width(const string& s) const
+{
+   float w = 0.0f;
+   for (string::const_iterator it = s.begin();
+        it != s.end(); ++it)
+      w += glyphs.at(*it)->advance_x();
+
+   return static_cast<int>(w);
+}
+
 }
 IFontPtr ft::load_font(const string& file, int h, FontType type)
 {
diff --git a/src/ft/IFont.hpp b/src/ft/IFont.hpp
index a55ac37..b161454 100644
--- a/src/ft/IFont.hpp
+++ b/src/ft/IFont.hpp
@@ -31,6 +31,7 @@ namespace ft {
          const string& s) const = 0;
 
       virtual int height() const = 0;
+      virtual int text_width(const string& s) const = 0;
    };
 
    typedef shared_ptr<IFont> IFontPtr;
diff --git a/src/gui2/Button.cpp b/src/gui2/Button.cpp
index c1fc4c2..3ce2946 100644
--- a/src/gui2/Button.cpp
+++ b/src/gui2/Button.cpp
@@ -20,9 +20,10 @@
 using namespace gui;
 
 Button::Button(const AttributeSet& attrs)
-   : Widget(attrs)
+   : Widget(attrs),
+     label_(attrs.get<string>("label"))
 {
-   property("label", label_);
+   
 }
 
 void Button::render(RenderContext& rc) const
diff --git a/src/gui2/Label.cpp b/src/gui2/Label.cpp
index 82dd929..a2e0602 100644
--- a/src/gui2/Label.cpp
+++ b/src/gui2/Label.cpp
@@ -21,13 +21,13 @@
 using namespace gui;
 
 Label::Label(const AttributeSet& attrs)
-   : Widget(attrs)
+   : Widget(attrs),
+     text_(attrs.get<string>("text"))
 {
-   property("text", text_);
+   width(500);
 }
 
 void Label::render(RenderContext& rc) const
 {
-   debug() << "Label::render x=" << x() << " y=" << y();
    rc.print(rc.theme().normal_font(), x(), y(), text_);
 }
diff --git a/src/gui2/Widget.cpp b/src/gui2/Widget.cpp
index 127d065..19110bb 100644
--- a/src/gui2/Widget.cpp
+++ b/src/gui2/Widget.cpp
@@ -19,6 +19,7 @@
 #define INC_WIDGET_HPP
 
 #include "gui2/Widget.hpp"
+#include "ILogger.hpp"
 
 #include <boost/lexical_cast.hpp>
 
@@ -27,13 +28,13 @@ using namespace gui;
 int Widget::unique_id(0);
 
 Widget::Widget(const AttributeSet& attrs)
-   : tmp_attrs(attrs)
+   : name_(attrs.get<string>("name", unique_name())),
+     x_(attrs.get<int>("x", 0)),
+     y_(attrs.get<int>("y", 0)),
+     width_(attrs.get<int>("width", 0)),
+     height_(attrs.get<int>("height", 0))
 {
-   const_property("name", name_, unique_name());
-   property("x", x_);
-   property("y", y_);
-   property("width", width_);
-   property("height", height_);
+   
 }
 
 string Widget::unique_name()
@@ -41,19 +42,4 @@ string Widget::unique_name()
    return "widget" + boost::lexical_cast<string>(unique_id++);
 }
 
-boost::any Widget::get_property(const string& key) const
-{
-   PropertyMap::const_iterator it = read_properties.find(key);
-   if (it != read_properties.end())
-      return (*it).second;
-   else
-      throw runtime_error("Widget " + name()
-         + " does not have property " + key);
-}
-
-void Widget::set_property(const string& key, boost::any value)
-{
-   write_properties[key] = value;
-}
-
 #endif
diff --git a/src/gui2/Window.cpp b/src/gui2/Window.cpp
index 2163f32..849ed03 100644
--- a/src/gui2/Window.cpp
+++ b/src/gui2/Window.cpp
@@ -21,9 +21,10 @@
 using namespace gui;
 
 Window::Window(const AttributeSet& attrs)
-   : ContainerWidget(attrs)
+   : ContainerWidget(attrs),
+     title_(attrs.get<string>("title", ""))
 {
-   property("title", title_);
+   
 }
 
 void Window::render(RenderContext& rc) const
-- 
2.39.2