← Back to branch summary

~linaro-maintainers/compiz-plugins-main/overlay-gl

« back to all changes in this revision

Viewing changes to debian/patches/fix-856177-865179.patch

  • Committer: Sam Spilsbury
  • Date: 2011-10-07 16:09:42 UTC
  • Revision ID: sam.spilsbury@canonical.com-20111007160942-9zkw97vowa95galq
Added some new patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-856177-865179.patch
 
1
=== modified file 'src/grid.cpp'
 
2
Index: compiz-plugins-main-0.9.6/grid/src/grid.cpp
 
3
===================================================================
 
4
--- compiz-plugins-main-0.9.6.orig/grid/src/grid.cpp    2011-10-07 20:49:30.011485286 +0800
 
5
+++ compiz-plugins-main-0.9.6/grid/src/grid.cpp 2011-10-07 20:51:50.544182148 +0800
 
6
@@ -239,7 +239,7 @@
 
7
 
 
8
        if (desiredRect.y () == currentRect.y () &&
 
9
            desiredRect.height () == currentRect.height () &&
 
10
-           where != GridMaximize && gw->lastTarget == where)
 
11
+           where & ~(GridMaximize | GridLeft | GridRight) && gw->lastTarget & where)
 
12
        {
 
13
            int slotWidth25  = workarea.width () / 4;
 
14
            int slotWidth33  = (workarea.width () / 3) + cw->border ().left;
 
15
@@ -376,6 +376,12 @@
 
16
                gw->lastBorder = cw->border ();
 
17
                /* Maximize the window */
 
18
                cw->maximize (CompWindowStateMaximizedVertMask);
 
19
+               /* Be evil */
 
20
+               if (cw->sizeHints ().flags & PResizeInc)
 
21
+               {
 
22
+                   gw->sizeHintsFlags |= PResizeInc;
 
23
+                   gw->window->sizeHints ().flags &= ~(PResizeInc);
 
24
+               }
 
25
            }
 
26
            else
 
27
            {
 
28
Index: compiz-plugins-main-0.9.6/grid/src/grid.h
 
29
===================================================================
 
30
--- compiz-plugins-main-0.9.6.orig/grid/src/grid.h      2011-10-07 20:49:30.011485286 +0800
 
31
+++ compiz-plugins-main-0.9.6/grid/src/grid.h   2011-10-07 20:51:08.995976136 +0800
 
32
@@ -168,8 +168,8 @@
 
33
        int resizeCount;
 
34
        CompRect currentSize;
 
35
        CompRect originalSize;
 
36
-       CompWindowExtents lastBorder;
 
37
        GridType lastTarget;
 
38
+       unsigned int sizeHintsFlags;
 
39
 
 
40
        void grabNotify (int, int, unsigned int, unsigned int);
 
41
 
 
42
@@ -178,8 +178,9 @@
 
43
        void moveNotify (int, int, bool);
 
44
 
 
45
        void stateChangeNotify (unsigned int);
 
46
-
 
47
-       void windowNotify (CompWindowNotify n);
 
48
+       void validateResizeRequest (unsigned int &valueMask,
 
49
+                                   XWindowChanges *xwc,
 
50
+                                   unsigned int source);
 
51
 };
 
52
 
 
53
 #define GRID_WINDOW(w) \