summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--doc/asciidoc/fluxbox.txt13
-rw-r--r--src/FbTk/Button.cc4
-rw-r--r--src/ToolFactory.cc3
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 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.0: 2Changes for 1.0.0:
3*07/04/08: 3*07/04/08:
4 * Menu when clicking workspacename in toolbar wasn't getting focused (Mark)
5 ToolFactory.cc
6 * Buttons with different textures when pressed weren't getting reset
7 properly (Mark)
8 FbTk/Button.cc
4 * Only replace numbers with zeros when calculating clock width (Simon) 9 * Only replace numbers with zeros when calculating clock width (Simon)
5 Otherwise width of things in proportional fonts can be way out. 10 Otherwise width of things in proportional fonts can be way out.
6 sf.net bug #1545066. 11 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.
304- *Windows Warping*: 304- *Windows Warping*:
305 If enabled, you can drag windows from one workspace to another. 305 If enabled, you can drag windows from one workspace to another.
306 306
307- *Desktop MouseWheel Switching*:
308 You will be able to change the workspace with your mousewheel if used on
309 the desktop or over the toolbar if the option is enabled.
310
311- *Decorate Transient Windows*: 307- *Decorate Transient Windows*:
312 With this option enabled all temporary windows will have a border and 308 With this option enabled all temporary windows will have a border and
313 grips. 309 grips.
@@ -558,13 +554,11 @@ The possible tools are:
558 554
559- *PrevWorkspace*: 555- *PrevWorkspace*:
560 This displays an arrow that allows to switch to the workspace left of the 556 This displays an arrow that allows to switch to the workspace left of the
561 current one. Same as MouseWheelDown with "Desktop MouseWheel Switching" 557 current one.
562 enabled.
563 558
564- *NextWorkspace*: 559- *NextWorkspace*:
565 This displays an arrow that allows to switch to the workspace right of the 560 This displays an arrow that allows to switch to the workspace right of the
566 current one. Same as MouseWheelUp with "Desktop MouseWheel Switching" 561 current one.
567 enabled.
568 562
569- *PrevWindow*: 563- *PrevWindow*:
570 This displays an arrow that switches focus to the previous visible window on 564 This displays an arrow that switches focus to the previous visible window on
@@ -713,8 +707,7 @@ session.screen0.toolbar.autoHide: <boolean>
713 False 707 False
714 708
715session.screen0.desktopwheeling: <boolean> 709session.screen0.desktopwheeling: <boolean>
716session.screen0.toolbar.wheeling: <boolean> 710 This sets the ability to utilize the user's scroll wheel to change the
717 These set the ability to utilize the user's scroll wheel to change the
718 current workspace. Default: True 711 current workspace. Default: True
719 712
720session.screen0.windowScrollAction: shade|nexttab 713session.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) {
129 if (!been_deleted) { 129 if (!been_deleted) {
130 mark_if_deleted = 0; 130 mark_if_deleted = 0;
131 if (m_background_pm) { 131 if (m_background_pm) {
132 if (m_pressed_pm != 0) { 132 if (m_pressed_pm != 0 || m_pressed_color.isAllocated()) {
133 update = true; 133 update = true;
134 setBackgroundPixmap(m_background_pm); 134 setBackgroundPixmap(m_background_pm);
135 } 135 }
136 } else if (m_pressed_color.isAllocated()) { 136 } else if (m_pressed_pm != 0 || m_pressed_color.isAllocated()) {
137 update = true; 137 update = true;
138 setBackgroundColor(m_background_color); 138 setBackgroundColor(m_background_color);
139 } 139 }
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:
65 m_tbar.screen().getHeadWidth(head), 65 m_tbar.screen().getHeadWidth(head),
66 m_tbar.screen().getHeadHeight(head)); 66 m_tbar.screen().getHeadHeight(head));
67 m_tbar.menu().move(m.first, m.second); 67 m_tbar.menu().move(m.first, m.second);
68 m_tbar.menu().show(); 68 m_tbar.menu().show();
69 m_tbar.menu().grabInputFocus();
69 } 70 }
70private: 71private:
71 Toolbar &m_tbar; 72 Toolbar &m_tbar;