M src/IconButton.hh → src/IconButton.hh

@@ -66,6 +66,7 @@ 
     bool setOrientation(FbTk::Orientation orient);
 
     virtual unsigned int preferredWidth() const;
+    void showTooltip();
 
     const FbTk::Signal<> &titleChanged() { return m_title_changed; }
 
@@ -74,7 +75,6 @@ void drawText(int x, int y, FbTk::FbDrawable *drawable_override);
 private:
     void reconfigAndClear();
     void setupWindow();
-    void showTooltip();
 
     /// Refresh all pixmaps and windows
     /// @param setup Wether to setup window again.

M src/Window.cc → src/Window.cc

@@ -2774,10 +2774,13 @@ if (ev.window == frame().window())
         Fluxbox::instance()->keys()->doAction(ev.type, ev.state, 0,
                                               Keys::ON_WINDOW, m_client);
 
-    WinClient *client = 0;
-    if (screen().focusControl().isMouseTabFocus()) {
-        // determine if we're in a label button (tab)
-        client = winClientOfLabelButtonWindow(ev.window);
+    // determine if we're in a label button (tab)
+    WinClient *client = winClientOfLabelButtonWindow(ev.window);
+    if (client) {
+        if (IconButton *tab = m_labelbuttons[client]) {
+            m_has_tooltip = true;
+            tab->showTooltip();
+        }
     }
 
     if (ev.window == frame().window() ||
@@ -2816,6 +2819,11 @@ // ignore grab activates, or if we're not visible
     if (ev.mode == NotifyGrab || ev.mode == NotifyUngrab ||
         !isVisible()) {
         return;
+    }
+
+    if (m_has_tooltip) {
+        m_has_tooltip = false;
+        screen().hideTooltip();
     }
 
     // still inside?

M src/Window.hh → src/Window.hh

@@ -576,6 +576,7 @@ ClientList m_clientlist;
     WinClient *m_client; ///< current client
     typedef std::map<WinClient *, IconButton *> Client2ButtonMap;
     Client2ButtonMap m_labelbuttons;
+    bool m_has_tooltip;
 
     SizeHints m_size_hint;
     struct {