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, 5 insertions, 5 deletions

diff --git a/src/TooltipWindow.cc b/src/TooltipWindow.cc
index 284f232..79d4163 100644
--- a/src/TooltipWindow.cc
+++ b/src/TooltipWindow.cc
@@ -38,7 +38,7 @@ TooltipWindow::TooltipWindow(const FbTk::FbWindow &parent, BScreen &screen,
 
 }
 
-void TooltipWindow::showText(const std::string &text) {
+void TooltipWindow::showText(const FbTk::BiDiString& text) {
 
     m_lastText = text;
     if (m_delay == 0)
@@ -50,13 +50,13 @@ void TooltipWindow::showText(const std::string &text) {
 
 void TooltipWindow::raiseTooltip() {
 
-    if (m_lastText.empty())
+    if (m_lastText.logical().empty())
         return;
 
     resize(m_lastText);
     reconfigTheme();
     int h = theme()->font().height() + theme()->bevelWidth() * 2;
-    int w = theme()->font().textWidth(m_lastText, m_lastText.size()) + theme()->bevelWidth() * 2;
+    int w = theme()->font().textWidth(m_lastText) + theme()->bevelWidth() * 2;
 
     Window root_ret; // not used
     Window window_ret; // not used
@@ -92,12 +92,12 @@ void TooltipWindow::raiseTooltip() {
     clear();
     theme()->font().drawText(*this, screen().screenNumber(),
                              theme()->iconbarTheme().text().textGC(), 
-                             m_lastText, m_lastText.size(), 
+                             m_lastText,
                              theme()->bevelWidth(),
                              theme()->bevelWidth() + theme()->font().ascent());
 }
 
-void TooltipWindow::updateText(const std::string &text) {
+void TooltipWindow::updateText(const FbTk::BiDiString& text) {
     m_lastText = text;
     raiseTooltip();
 }