window-to-window snapping is now a run-time option.

[chaz/openbox] / src / Windowmenu.cc

diff --git a/src/Windowmenu.cc b/src/Windowmenu.cc
index f274a047e3cc38e121503bd305154b48d29dac3a..bfe1a1e5461aac124498e7eb1a067d5a0392d8a9 100644 (file)
--- a/src/Windowmenu.cc
+++ b/src/Windowmenu.cc
@@ -90,6 +90,9 @@ void Windowmenu::show(void) {
 
 
 void Windowmenu::itemSelected(int button, unsigned int index) {
+  if (button != 1)
+    return;
+  
   BasemenuItem *item = find(index);
 
   hide();
@@ -103,7 +106,7 @@ void Windowmenu::itemSelected(int button, unsigned int index) {
     break;
 
   case BScreen::WindowMaximize:
-    window->maximize(button);
+    window->maximize(1);        // full maximize
     break;
 
   case BScreen::WindowClose:
@@ -189,6 +192,7 @@ void Windowmenu::SendtoWorkspacemenu::update(void) {
       ++r;
     } else {
       changeItemLabel(i, getScreen()->getWorkspace(i)->getName());
+      setItemEnabled(i, i != getScreen()->getCurrentWorkspaceID());
     }
   }