← Back to branch summary

~hypodermia/ubuntu/oneiric/compiz/fix-for-bug-301174

« back to all changes in this revision

Viewing changes to debian/patches/086_new_grid_defaults.patch

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-04-07 18:06:44 UTC
  • mfrom: (0.168.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20110407180644-7xwnirf7k3zotc2w
Tags: 1:0.9.4+bzr20110407-0ubuntu2
https://launchpad.net/bugs/711561
https://launchpad.net/bugs/752711
* New upstream snapshot:
  - fix unity-window-decorator crashed with SIGSEGV in event_filter_funct
    (LP: #711561)
* debian/patches/086_new_grid_defaults.patch:
  - change threshold to 15 on sides and 20 on top to work well with the new
    animtion
* debian/patches/01_bzr_fix_grid_on_multimonitor.patch,
  01_bzr_fix_resize.patch, 01_bzr_fix_grid_premultiply.patch:
  - from upstream bzr, fix grid on multimonitor and colors handling
* debian/patches/086_new_grid_defaults.patch,
  debian/patches/029_default_options.patch:
  - set the resize grid shadow to orange (LP: #752711)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/086_new_grid_defaults.patch
1
 
Index: compiz-0.9.4/plugins/grid/grid.xml.in
 
1
Index: compiz-0.9.4+bzr20110407/plugins/grid/grid.xml.in
2
2
===================================================================
3
 
--- compiz-0.9.4.orig/plugins/grid/grid.xml.in  2011-02-24 12:56:38.964211832 +0100
4
 
+++ compiz-0.9.4/plugins/grid/grid.xml.in       2011-02-24 13:06:00.650997089 +0100
5
 
@@ -84,7 +84,7 @@
 
3
--- compiz-0.9.4+bzr20110407.orig/plugins/grid/grid.xml.in      2011-04-07 14:44:00.000000000 +0200
 
4
+++ compiz-0.9.4+bzr20110407/plugins/grid/grid.xml.in   2011-04-07 16:59:36.811546331 +0200
 
5
@@ -81,7 +81,7 @@
6
6
                        <option name="top_left_corner_action" type="int">
7
7
                            <_short>Upper Left Corner</_short>
8
8
                            <_long>Action to be performed when window is dropped on the top left corner</_long>
11
11
                            <min>0</min>
12
12
                            <max>10</max>
13
13
                            <desc>
14
 
@@ -186,7 +186,7 @@
 
14
@@ -183,7 +183,7 @@
15
15
                        <option name="top_right_corner_action" type="int">
16
16
                            <_short>Upper Right Corner</_short>
17
17
                            <_long>Action to be performed when window is dropped on the top right corner</_long>
20
20
                            <min>0</min>
21
21
                            <max>10</max>
22
22
                            <desc>
23
 
@@ -339,7 +339,7 @@
 
23
@@ -336,7 +336,7 @@
24
24
                        <option name="bottom_left_corner_action" type="int">
25
25
                            <_short>Bottom Left Corner</_short>
26
26
                            <_long>Action to be performed when window is dropped on the bottom left corner</_long>
29
29
                            <min>0</min>
30
30
                            <max>10</max>
31
31
                            <desc>
32
 
@@ -390,7 +390,7 @@
 
32
@@ -387,7 +387,7 @@
33
33
                        <option name="bottom_edge_action" type="int">
34
34
                            <_short>Bottom Edge</_short>
35
35
                            <_long>Action to be performed when window is dropped on the bottom edge</_long>
38
38
                            <min>0</min>
39
39
                            <max>10</max>
40
40
                            <desc>
41
 
@@ -441,7 +441,7 @@
 
41
@@ -438,7 +438,7 @@
42
42
                        <option name="bottom_right_corner_action" type="int">
43
43
                            <_short>Bottom Right Corner</_short>
44
44
                            <_long>Action to be performed when window is dropped on the bottom right corner</_long>
47
47
                            <min>0</min>
48
48
                            <max>10</max>
49
49
                            <desc>
 
50
@@ -502,21 +502,21 @@
 
51
                        <option name="left_edge_threshold" type="int">
 
52
                                <_short>Left Edge</_short>
 
53
                                <_long>Maximum number of pixels from the left edge a window can be dropped</_long>
 
54
-                               <default>5</default>
 
55
+                               <default>15</default>
 
56
                                <min>0</min>
 
57
                                <max>500</max>
 
58
                        </option>
 
59
                        <option name="right_edge_threshold" type="int">
 
60
                                <_short>Right Edge</_short>
 
61
                                <_long>Maximum number of pixels from the right edge a window can be dropped</_long>
 
62
-                               <default>5</default>
 
63
+                               <default>15</default>
 
64
                                <min>0</min>
 
65
                                <max>500</max>
 
66
                        </option>
 
67
                        <option name="top_edge_threshold" type="int">
 
68
                                <_short>Top Edge</_short>
 
69
                                <_long>Maximum number of pixels from the top edge a window can be dropped</_long>
 
70
-                               <default>5</default>
 
71
+                               <default>20</default>
 
72
                                <min>0</min>
 
73
                                <max>500</max>
 
74
                        </option>
 
75
@@ -540,9 +540,9 @@
 
76
                        <_short>Outline Color</_short>
 
77
                        <_long>Color of the resize indicator outline</_long>
 
78
                        <default>
 
79
-                           <red>0x2f2f</red>
 
80
-                           <green>0x2f2f</green>
 
81
-                           <blue>0x4f4f</blue>
 
82
+                           <red>0xfbfb</red>
 
83
+                           <green>0x8b8b</green>
 
84
+                           <blue>0x0</blue>
 
85
                            <alpha>0x9f9f</alpha>
 
86
                        </default>
 
87
                </option>
 
88
@@ -550,9 +550,9 @@
 
89
                        <_short>Fill Color</_short>
 
90
                        <_long>Fill color of the resize indicator</_long>
 
91
                        <default>
 
92
-                           <red>0x2f2f</red>
 
93
-                           <green>0x2f2f</green>
 
94
-                           <blue>0x4f4f</blue>
 
95
+                           <red>0xfbfb</red>
 
96
+                           <green>0x8b8b</green>
 
97
+                           <blue>0x0</blue>
 
98
                            <alpha>0x4f4f</alpha>
 
99
                        </default>
 
100
                </option>