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, 4 insertions, 3 deletions

diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 09a4507..85997ed 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -285,7 +285,7 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme,
     m_menu.setInternalMenu();
 
     // add iconbar menu to toolbar menu
-    menu.insert(m_menu.label(), &m_menu);
+    menu.insert(m_menu.label().logical(), &m_menu);
 
     // setup signals
     theme.reconfigSig().attach(this);
@@ -528,7 +528,7 @@ void IconbarTool::removeWindow(Focusable &win) {
     if (it == m_icons.end())
         return;
 
-    fbdbg<<"IconbarTool::"<<__FUNCTION__<<"( 0x"<<&win<<" title = "<<win.title()<<") found!"<<endl;
+    fbdbg<<"IconbarTool::"<<__FUNCTION__<<"( 0x"<<&win<<" title = "<<win.title().logical()<<") found!"<<endl;
 
     // remove from list and render theme again
     IconButton *button = it->second;
@@ -543,7 +543,7 @@ IconButton *IconbarTool::makeButton(Focusable &win) {
     if (!fbwin || fbwin->clientList().empty())
         return 0;
 
-    fbdbg<<"IconbarTool::addWindow(0x"<<&win<<" title = "<<win.title()<<")"<<endl;
+    fbdbg<<"IconbarTool::addWindow(0x"<<&win<<" title = "<<win.title().logical()<<")"<<endl;
 
     IconButton *button = new IconButton(m_icon_container, m_focused_theme,
                                         m_unfocused_theme, win);
@@ -573,3 +573,4 @@ void IconbarTool::setOrientation(FbTk::Orientation orient) {
     m_icon_container.setOrientation(orient);
     ToolbarItem::setOrientation(orient);
 }
+