menu from workspacename tool wasn't focused, and fixed unpressed button rendering

4 files changed, 12 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index dadd00c..b8ea903 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
  (Format: Year/Month/Day)
 Changes for 1.0.0:
 *07/04/08:
+   * Menu when clicking workspacename in toolbar wasn't getting focused (Mark)
+     ToolFactory.cc
+   * Buttons with different textures when pressed weren't getting reset
+     properly (Mark)
+     FbTk/Button.cc
    * Only replace numbers with zeros when calculating clock width (Simon)
      Otherwise width of things in proportional fonts can be way out.
      sf.net bug #1545066.
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index 657e09c..9d77639 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -304,10 +304,6 @@ from the init file, but this is an easier and faster way for most users.
 - *Windows Warping*:
     If enabled, you can drag windows from one workspace to another.
 
-- *Desktop MouseWheel Switching*:
-    You will be able to change the workspace with your mousewheel if used on
-    the desktop or over the toolbar if the option is enabled.
-
 - *Decorate Transient Windows*:
     With this option enabled all temporary windows will have a border and
     grips.
@@ -558,13 +554,11 @@ The possible tools are:
 
 - *PrevWorkspace*:
     This displays an arrow that allows to switch to the workspace left of the
-    current one. Same as MouseWheelDown with "Desktop MouseWheel Switching"
-    enabled.
+    current one.
 
 - *NextWorkspace*:
     This displays an arrow that allows to switch to the workspace right of the
-    current one. Same as MouseWheelUp with "Desktop MouseWheel Switching"
-    enabled.
+    current one.
 
 - *PrevWindow*:
     This displays an arrow that switches focus to the previous visible window on
@@ -713,8 +707,7 @@ session.screen0.toolbar.autoHide: <boolean>
       False
 
 session.screen0.desktopwheeling: <boolean>
-session.screen0.toolbar.wheeling: <boolean>
-      These set the ability to utilize the user's scroll wheel to change the
+      This sets the ability to utilize the user's scroll wheel to change the
       current workspace. Default: True
 
 session.screen0.windowScrollAction: shade|nexttab
diff --git a/src/FbTk/Button.cc b/src/FbTk/Button.cc
index f13adf3..a9b27b2 100644
--- a/src/FbTk/Button.cc
+++ b/src/FbTk/Button.cc
@@ -129,11 +129,11 @@ void Button::buttonReleaseEvent(XButtonEvent &event) {
     if (!been_deleted) {
         mark_if_deleted = 0;
         if (m_background_pm) {
-            if (m_pressed_pm != 0) {
+            if (m_pressed_pm != 0 || m_pressed_color.isAllocated()) {
                 update = true;
                 setBackgroundPixmap(m_background_pm);
             }
-        } else if (m_pressed_color.isAllocated()) {
+        } else if (m_pressed_pm != 0 || m_pressed_color.isAllocated()) {
             update = true;
             setBackgroundColor(m_background_color);
         }
diff --git a/src/ToolFactory.cc b/src/ToolFactory.cc
index f2d1ccd..ee1316a 100644
--- a/src/ToolFactory.cc
+++ b/src/ToolFactory.cc
@@ -65,7 +65,8 @@ public:
                                 m_tbar.screen().getHeadWidth(head),
                                 m_tbar.screen().getHeadHeight(head));
         m_tbar.menu().move(m.first, m.second);
-        m_tbar.menu().show();        
+        m_tbar.menu().show();
+        m_tbar.menu().grabInputFocus();
     }
 private:
     Toolbar &m_tbar;