aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-02-04 18:41:08 (GMT)
committermarkt <markt>2007-02-04 18:41:08 (GMT)
commit07a3b3939bbdfa084f91c07984fdc60c2696a213 (patch)
tree871f25beb412244486d47ba12baadcfeb1162648
parente46f152ee5c41771521b8af4a3c5f6558acd16c1 (diff)
downloadfluxbox-07a3b3939bbdfa084f91c07984fdc60c2696a213.zip
fluxbox-07a3b3939bbdfa084f91c07984fdc60c2696a213.tar.bz2
clicking on the edge of a button didn't work
-rw-r--r--ChangeLog4
-rw-r--r--src/FbTk/Button.cc5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 96d5887..a5235b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*07/02/04:
4 * Clicking on the edge of a button didn't work, bugs #1060891, #1517747
5 (Mark)
6 FbTk/Button.cc
3*07/02/02: 7*07/02/02:
4 * Reverted patch from svn 4684, allowing transparency in window buttons, 8 * Reverted patch from svn 4684, allowing transparency in window buttons,
5 until we get it working with titlebar transparency, since the old buggy 9 until we get it working with titlebar transparency, since the old buggy
diff --git a/src/FbTk/Button.cc b/src/FbTk/Button.cc
index 8dba936..767ed47 100644
--- a/src/FbTk/Button.cc
+++ b/src/FbTk/Button.cc
@@ -118,8 +118,9 @@ void Button::buttonReleaseEvent(XButtonEvent &event) {
118 // hence the mark_if_deleted mechanism so that we can 118 // hence the mark_if_deleted mechanism so that we can
119 // update our state after the command 119 // update our state after the command
120 if (event.button > 0 && event.button <= 5 && 120 if (event.button > 0 && event.button <= 5 &&
121 event.x > 0 && event.x < static_cast<signed>(width()) && 121 // I'm not quite sure why we get events with e.g. y == height, but we do
122 event.y > 0 && event.y < static_cast<signed>(height()) && 122 event.x >= 0 && event.x <= static_cast<signed>(width()) &&
123 event.y >= 0 && event.y <= static_cast<signed>(height()) &&
123 m_onclick[event.button -1].get() != 0) 124 m_onclick[event.button -1].get() != 0)
124 m_onclick[event.button - 1]->execute(); 125 m_onclick[event.button - 1]->execute();
125 126