diff options
author | mathias <mathias> | 2007-08-28 07:36:57 (GMT) |
---|---|---|
committer | mathias <mathias> | 2007-08-28 07:36:57 (GMT) |
commit | adddf014bd80d5ea7595fc1e8df233a857b8d90f (patch) | |
tree | 3965423f10bcdf2915696ceb46cc28f34b00e803 | |
parent | 270782c8a57cd16658d4891ab2cc310bc9ad1aad (diff) | |
download | fluxbox_paul-adddf014bd80d5ea7595fc1e8df233a857b8d90f.zip fluxbox_paul-adddf014bd80d5ea7595fc1e8df233a857b8d90f.tar.bz2 |
dont use hardcoded Mod1Mask anymore
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | src/Window.cc | 6 |
2 files changed, 8 insertions, 1 deletions
@@ -1,5 +1,8 @@ | |||
1 | (Format: Year/Month/Day) | 1 | (Format: Year/Month/Day) |
2 | Changes for 1.0.0: | 2 | Changes 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 | ||
2674 | void FluxboxWindow::buttonReleaseEvent(XButtonEvent &re) { | 2674 | void 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()) |