introduced FbTk::BidiString

a 'BidiString' holds both the logical content and the visual reordered
version of the content of a string. this helps to reduce the number of
calls to reorder the string before drawing it (as introduced in the patch
from Ken Bloom) and to be more consistent in menus and textboxes (drawing
cursors and underlining text).

1 files changed, 3 insertions, 11 deletions

diff --git a/src/FbTk/IntMenuItem.hh b/src/FbTk/IntMenuItem.hh
index 9d2d2ba..2df3f14 100644
--- a/src/FbTk/IntMenuItem.hh
+++ b/src/FbTk/IntMenuItem.hh
@@ -23,6 +23,7 @@
 #define FBTK_INTMENUITEM_HH
 
 #include "MenuItem.hh"
+#include "StringUtil.hh"
 
 namespace FbTk {
 
@@ -39,15 +40,6 @@ public:
         setCloseOnClick(false);
     }
 
-    /* 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, unsigned int mods) {
         static int last_time = -201;
         int inc_val = 1;
@@ -86,11 +78,11 @@ public:
     }
 
     void updateLabel() {
-        setLabel(appendIntValue(m_org_label, m_res));
+        setLabel(m_org_label.logical() + ":  " + FbTk::StringUtil::number2String(m_res));
     }
 
 private:
-    std::string m_org_label; ///< original label
+    FbTk::BiDiString 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
     Accessor<int> &m_res; ///< resource item to be changed