aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormarkt <markt>2007-04-08 18:01:01 (GMT)
committermarkt <markt>2007-04-08 18:01:01 (GMT)
commit3b9351be77b168c54332ff51524e11090c1dd2bc (patch)
tree9c49979e3fcee96abbdbe86e75ef81c7625e68ea /src
parent52a96c4e9dc21b53ccfa753e922e67981bca4d36 (diff)
downloadfluxbox_paul-3b9351be77b168c54332ff51524e11090c1dd2bc.zip
fluxbox_paul-3b9351be77b168c54332ff51524e11090c1dd2bc.tar.bz2
menu from workspacename tool wasn't focused, and fixed unpressed button rendering
Diffstat (limited to 'src')
-rw-r--r--src/FbTk/Button.cc4
-rw-r--r--src/ToolFactory.cc3
2 files changed, 4 insertions, 3 deletions
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;