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 @@
  (Format: Year/Month/Day)
 Changes for 1.0.0:
+*07/08/27:
+   * Fix hardcoded Mod1, use ModKey() now (Mathias)
+     Window.cc
 *07/08/20:
    * Fix some focus issues with moving windows between workspaces (Mark)
      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) {
 
 void FluxboxWindow::buttonReleaseEvent(XButtonEvent &re) {
 
-    if ((re.button == 1) && (re.state & Mod1Mask) && !screen().clickRaises())
+    if ((re.button == 1) && (re.state & Fluxbox::instance()->getModKey()) 
+         && !screen().clickRaises()) {
+
         if (!isMoving())
             raise();
 
+    }
+
     if (isMoving())
         stopMoving();
     else if (isResizing())