← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/fix-834585.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-834585.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-08 00:03:01.301062568 +0800
 
5
+++ compiz-plugins-main-0.9.6/grid/src/grid.cpp 2011-10-08 00:03:28.497197395 +0800
 
6
@@ -663,23 +663,20 @@
 
7
                        if (edge != NoEdge && check)
 
8
                        {
 
9
                                CompWindow *cw = screen->findWindow (screen->activeWindow ());
 
10
-                               if (cw)
 
11
-                               {
 
12
-                                   animations.push_back (Animation ());
 
13
-                                   int current = animations.size () - 1;
 
14
-                                   animations.at (current).fromRect    = cw->serverBorderRect ();
 
15
-                                   animations.at (current).currentRect = cw->serverBorderRect ();
 
16
-                                   animations.at (current).timer = animations.at (current).duration;
 
17
-                                   animations.at (current).targetRect = desiredSlot;
 
18
+                               animations.push_back (Animation ());
 
19
+                               int current = animations.size () - 1;
 
20
+                               animations.at (current).fromRect        = cw->serverBorderRect ();
 
21
+                               animations.at (current).currentRect     = cw->serverBorderRect ();
 
22
+                               animations.at (current).timer = animations.at (current).duration;
 
23
+                               animations.at (current).targetRect = desiredSlot;
 
24
 
 
25
-                                   if (lastEdge == NoEdge || !animating)
 
26
-                                   {
 
27
+                               if (lastEdge == NoEdge || !animating)
 
28
+                               {
 
29
                                        /* Cursor has entered edge region from non-edge region */
 
30
                                        animating = true;
 
31
                                        glScreen->glPaintOutputSetEnabled (this, true);
 
32
                                        cScreen->preparePaintSetEnabled (this, true);
 
33
                                        cScreen->donePaintSetEnabled (this, true);
 
34
-                                   }
 
35
                                }
 
36
                        }
 
37
                }