per-window transparency, including apps and menu support, plus some

infrastructure and related changes. Thanks for original patch from 
Julien Trolet, dmxen at sourceforge dot net

1 files changed, 56 insertions, 3 deletions

diff --git a/src/IntResMenuItem.hh b/src/IntResMenuItem.hh
index a0e102d..0be2775 100644
--- a/src/IntResMenuItem.hh
+++ b/src/IntResMenuItem.hh
@@ -27,18 +27,71 @@
 #include "MenuItem.hh"
 #include "Resource.hh"
 
+#include <string>
+
 /// Changes an resource integer value between min and max
+template <typename Type>
 class IntResMenuItem: public FbTk::MenuItem {
 public:
-    IntResMenuItem(const FbTk::FbString &label, FbTk::Resource<int> &res, int min_val, int max_val, FbTk::Menu &host_menu);
+    IntResMenuItem(const FbTk::FbString &label, Type &res, int min_val, int max_val, FbTk::Menu &host_menu) :
+        FbTk::MenuItem(label, host_menu), m_org_label(FbTk::MenuItem::label()),
+        m_max(max_val), m_min(min_val), m_res(res) { 
+        updateLabel();
+    }
+
+    /* Utility, but doesn't get found in anonymous namespace? */
+    std::string appendIntValue(const std::string &label, int value) {
+        char *buff = new char[label.size() + 16];
+        sprintf(buff, "%s:  %d", label.c_str(), value);
+        std::string ret(buff);
+        delete [] buff;
+        return ret;
+    }
+
+    void click(int button, int time) {
+        static int last_time = -201;
+        int inc_val = 1;
+        // check double click
+        //!! TODO: must have some sort of "global" double click time in FbTk
+        if (time - last_time <= 200)
+            inc_val = 5;
+
 
-    void click(int button, int time);
+        last_time = time;
+        
+        if ((button == 4 || button == 3)&& *m_res < m_max) // scroll up
+            m_res.get() += inc_val;
+        else if ((button == 5 || button == 1) && *m_res > m_min) // scroll down
+            m_res.get() -= inc_val;
+        
+        // clamp value
+        if (*m_res > m_max)
+            m_res.get() = m_max;
+        else if (*m_res < m_min)
+            m_res.get() = m_min;
+        
+        // update label
+        updateLabel();
+        // call other commands
+        FbTk::MenuItem::click(button, time);
+        
+        // show new value, which for us means forcing a full menu update
+        // since the text is drawn onto the background!
+        if (menu()) {
+            menu()->frameWindow().updateBackground(false);
+            menu()->clearWindow();
+        }
+    }
 
+    void updateLabel() {
+        setLabel(appendIntValue(m_org_label, *m_res));
+    }
+        
 private:
     std::string m_org_label; ///< original label
     const int m_max; ///< maximum value the integer can have
     const int m_min; ///< minimum value the integer can have
-    FbTk::Resource<int> &m_res; ///< resource item to be changed
+    Type &m_res; ///< resource item to be changed
 };
 
 #endif // INTRESMENUITEM_HH