[beryl-commits] r1517 - branches/beryl-group-with-tab-plugin

[svn at server.beryl-project.org]

Author: svn
Date: 2006-12-03 20:34:01 +0100 (Sun, 03 Dec 2006)
New Revision: 1517

Modified:
   branches/beryl-group-with-tab-plugin/group.c
Log:


Modified: branches/beryl-group-with-tab-plugin/group.c
===================================================================
--- branches/beryl-group-with-tab-plugin/group.c	2006-12-03 18:54:19 UTC (rev 1516)
+++ branches/beryl-group-with-tab-plugin/group.c	2006-12-03 19:34:01 UTC (rev 1517)
@@ -403,6 +403,7 @@
 
         unsigned int state = getWindowState (d, cw->id);
         state &= ~CompWindowStateSkipTaskbarMask;
+        state &= ~CompWindowStateSkipPagerMask;
         setWindowState (d, state, cw->id);
 
         gw->animate = TRUE;
@@ -495,6 +496,9 @@
         if (gd->groups[index].tabbed)
         {
             groupUntabGroup (d, gd->groups[index].topTab, id);
+            // we don't want an animation here because it won't work...
+            gd->groups[index].topTab = NULL;
+            gd->animatedGroup = -1;
         }
 
         int i;
@@ -618,33 +622,6 @@
 }
 
 /*
- * groupRemoveWindow
- *
- */
-static void
-groupUnhookWindow (CompWindow *w)
-{
-    //w->hidden = TRUE;
-    //hideWindow (w);
-
-    unhookWindowFromScreen (w->screen, w);
- 
-    if (w->attrib.map_state == IsViewable && w->damaged)
-    {
-        if (w->type == CompWindowTypeDesktopMask)
-            w->screen->desktopWindowCount--;
- 
-        if (w->struts)
-            updateWorkareaForScreen (w->screen);
-    }
- 
-    updateClientListForScreen (w->screen);
- 
-    if (!w->redirected)
-        w->screen->overlayWindowCount--;
-}
-
-/*
  * groupSyncWindows
  *
  */
@@ -1731,6 +1708,7 @@
                                 
                 unsigned int state = getWindowState (s->display, cw->id);
                 state |= CompWindowStateSkipTaskbarMask;
+                state |= CompWindowStateSkipPagerMask;
                 setWindowState (s->display, state, cw->id);
            }
         }
@@ -2437,8 +2415,8 @@
  */
 CompPluginVTable groupVTable = {
     "group",
-    "Window Grouper",
-    "With this plugin you can group windows.",
+    N_("Window Grouper"),
+    N_("With this plugin you can group windows."),
     groupInit,
     groupFini,
     groupInitDisplay,