redraw menu checkmarks when needed, this was broken since they're on the opposite...

[chaz/openbox] / src / Windowmenu.cc

diff --git a/src/Windowmenu.cc b/src/Windowmenu.cc
index f274a047e3cc38e121503bd305154b48d29dac3a..374925be80259fa0049b4c84a72414818d3fbf5e 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:
@@ -111,13 +114,15 @@ void Windowmenu::itemSelected(int button, unsigned int index) {
     break;
 
   case BScreen::WindowRaise: {
-    Workspace *wkspc = getScreen()->getWorkspace(window->getWorkspaceNumber());
+    Workspace *wkspc =
+      getScreen()->getWorkspace(window->getWorkspaceNumber());
     wkspc->raiseWindow(window);
   }
     break;
 
   case BScreen::WindowLower: {
-    Workspace *wkspc = getScreen()->getWorkspace(window->getWorkspaceNumber());
+    Workspace *wkspc =
+      getScreen()->getWorkspace(window->getWorkspaceNumber());
     wkspc->lowerWindow(window);
   }
     break;
@@ -189,6 +194,7 @@ void Windowmenu::SendtoWorkspacemenu::update(void) {
       ++r;
     } else {
       changeItemLabel(i, getScreen()->getWorkspace(i)->getName());
+      setItemEnabled(i, i != getScreen()->getCurrentWorkspaceID());
     }
   }