aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/Window.cc6
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 09d79e1..ba96feb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.0: 2Changes for 1.0.0:
3*07/08/27:
4 * Fix hardcoded Mod1, use ModKey() now (Mathias)
5 Window.cc
3*07/08/20: 6*07/08/20:
4 * Fix some focus issues with moving windows between workspaces (Mark) 7 * Fix some focus issues with moving windows between workspaces (Mark)
5 FocusControl.cc 8 FocusControl.cc
diff --git a/src/Window.cc b/src/Window.cc
index 9ee1c5e..8bf728f 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2673,10 +2673,14 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent &be) {
2673 2673
2674void FluxboxWindow::buttonReleaseEvent(XButtonEvent &re) { 2674void FluxboxWindow::buttonReleaseEvent(XButtonEvent &re) {
2675 2675
2676 if ((re.button == 1) && (re.state & Mod1Mask) && !screen().clickRaises()) 2676 if ((re.button == 1) && (re.state & Fluxbox::instance()->getModKey())
2677 && !screen().clickRaises()) {
2678
2677 if (!isMoving()) 2679 if (!isMoving())
2678 raise(); 2680 raise();
2679 2681
2682 }
2683
2680 if (isMoving()) 2684 if (isMoving())
2681 stopMoving(); 2685 stopMoving();
2682 else if (isResizing()) 2686 else if (isResizing())