add tooltips for iconbar buttons when title is too long to fit

4 files changed, 35 insertions, 6 deletions

diff --git a/src/FbTk/Button.cc b/src/FbTk/Button.cc
index 0284fea..9edbe5c 100644
--- a/src/FbTk/Button.cc
+++ b/src/FbTk/Button.cc
@@ -30,7 +30,8 @@ namespace FbTk {
 Button::Button(int screen_num, int x, int y,
                unsigned int width, unsigned int height):
     FbWindow(screen_num, x, y, width, height,
-             ExposureMask | ButtonPressMask | ButtonReleaseMask),
+             ExposureMask | ButtonPressMask | EnterWindowMask |
+             LeaveWindowMask | ButtonReleaseMask),
     m_background_pm(0),
     m_pressed_pm(0),
     m_pressed_color(),
@@ -45,7 +46,8 @@ Button::Button(int screen_num, int x, int y,
 Button::Button(const FbWindow &parent, int x, int y, 
                unsigned int width, unsigned int height):
     FbWindow(parent, x, y, width, height,
-             ExposureMask | ButtonPressMask | ButtonReleaseMask),
+             ExposureMask | ButtonPressMask | ButtonReleaseMask |
+             EnterWindowMask | LeaveWindowMask),
     m_background_pm(0),
     m_pressed_pm(0),
     m_pressed_color(),
@@ -90,6 +92,14 @@ void Button::setBackgroundPixmap(Pixmap pm) {
     FbTk::FbWindow::setBackgroundPixmap(pm);
 }
 
+
+void Button::enterNotifyEvent(XCrossingEvent &ce){
+                
+}
+void Button::leaveNotifyEvent(XCrossingEvent &ce){
+                
+}
+
 void Button::buttonPressEvent(XButtonEvent &event) {
     bool update = false;
     if (m_pressed_pm != 0) {
diff --git a/src/FbTk/Button.hh b/src/FbTk/Button.hh
index 99d8ee9..1f65799 100644
--- a/src/FbTk/Button.hh
+++ b/src/FbTk/Button.hh
@@ -61,6 +61,8 @@ public:
     //@{
     virtual void buttonPressEvent(XButtonEvent &event);
     virtual void buttonReleaseEvent(XButtonEvent &event);
+    virtual void enterNotifyEvent(XCrossingEvent &ce);    
+    virtual void leaveNotifyEvent(XCrossingEvent &ce);    
     virtual void exposeEvent(XExposeEvent &event);
     //@}
 
diff --git a/src/FbTk/TextButton.cc b/src/FbTk/TextButton.cc
index 561fe21..f259d89 100644
--- a/src/FbTk/TextButton.cc
+++ b/src/FbTk/TextButton.cc
@@ -158,11 +158,9 @@ void TextButton::drawText(int x_offset, int y_offset, FbDrawable *drawable) {
     translateSize(m_orientation, textw, texth);
 
     int align_x = FbTk::doAlignment(textw - x_offset - m_left_padding - m_right_padding,
-                                    bevel(),
-                                    justify(),
-                                    font(),
+                                    bevel(), justify(), font(),
                                     text().data(), text().size(),
-                                    textlen); // return new text lne
+                                    textlen); // return new text len
 
     // center text by default
     int center_pos = texth/2 + font().ascent()/2 - 1;
@@ -183,6 +181,23 @@ void TextButton::drawText(int x_offset, int y_offset, FbDrawable *drawable) {
                     textx, texty, m_orientation); // position
 }
 
+
+bool TextButton::textExceeds(int x_offset) {
+    
+    unsigned int textlen = text().size();
+    // do text alignment
+
+    unsigned int textw = width(), texth = height();
+    translateSize(m_orientation, textw, texth);
+
+    FbTk::doAlignment(textw - x_offset - m_left_padding - m_right_padding,
+                      bevel(), justify(), font(), text().data(), text().size(),
+                      textlen); // return new text len
+
+    return text().size()>textlen;
+    
+}
+
 void TextButton::exposeEvent(XExposeEvent &event) {
     clearArea(event.x, event.y, event.width, event.height, false);
 }
diff --git a/src/FbTk/TextButton.hh b/src/FbTk/TextButton.hh
index eb48e61..22cda82 100644
--- a/src/FbTk/TextButton.hh
+++ b/src/FbTk/TextButton.hh
@@ -80,6 +80,8 @@ public:
 
 protected:
     virtual void drawText(int x_offset, int y_offset, FbDrawable *drawable_override);
+    // return true if the text will be truncated
+    bool textExceeds(int x_offset);
 
 private:
     FbTk::Font *m_font;