fix toggleMaximize and trackControledWindow functions

common/wck-utils.c

@@ -107,6 +107,9 @@ static void trackControledWindow (WckUtils *win) {
     }
 
     if (win->activewindow
+        && (!win->activeworkspace
+            || wnck_window_is_in_viewport(win->activewindow, win->activeworkspace))
+        && !wnck_window_is_minimized(win->activewindow)
         && (wnck_window_is_maximized(win->activewindow)
             || !win->only_maximized)) {
         win->controlwindow = win->activewindow;
@@ -209,13 +212,11 @@ static void active_workspace_changed (WnckScreen *screen,
     trackControledWindow(win);
 }
 
-void toggleMaximize (WckUtils *win) {
-    if (win->controlwindow) {
-		if (wnck_window_is_maximized(win->controlwindow))
-			wnck_window_maximize(win->controlwindow);
-		else
-			wnck_window_unmaximize(win->controlwindow);
-    }
+void toggleMaximize (WnckWindow *window) {
+    if (window && wnck_window_is_maximized(window))
+        wnck_window_unmaximize(window);
+    else
+        wnck_window_maximize(window);
 }
 
 void initWnck (WckUtils *win, gboolean only_maximized, gpointer data) {

common/wck-utils.h

@@ -51,7 +51,7 @@ typedef struct {
 } WckUtils;
 
 void initWnck (WckUtils *win, gboolean only_maximized, gpointer data);
-void toggleMaximize (WckUtils *win);
+void toggleMaximize (WnckWindow *window);
 
 G_END_DECLS
 

panel-plugin/buttons/wckbuttons.c

@@ -394,7 +394,7 @@ static gboolean on_maximize_button_release (GtkWidget *event_box,
 
     if (event->button != 1) return FALSE;
 
-    toggleMaximize(wb->win);
+    toggleMaximize(wb->win->controlwindow);
 
     return TRUE;
 }

panel-plugin/title/windowck-title.c

@@ -173,7 +173,7 @@ gboolean on_title_pressed(GtkWidget *title, GdkEventButton *event, WindowckPlugi
     if (event->button == 1) {
         /* double/tripple click */
         if (event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) {
-            toggleMaximize(wckp->win);
+            toggleMaximize(wckp->win->controlwindow);
         }
         else {
         /* left-click */