compcomm-plugins-main

Merge lp:~dbarth/compcomm-plugins-main/0.9.5.94-changes into lp:~compiz/compcomm-plugins-main/ubuntu

  1. 0.9.5.94-changes
  2. Merge into ubuntu
Proposed by David Barth
Status: Merged
Merged at revision: 207
Proposed branch: lp:~dbarth/compcomm-plugins-main/0.9.5.94-changes
Merge into: lp:~compiz/compcomm-plugins-main/ubuntu
Diff against target: 201 lines (+77/-102)
4 files modified
debian/changelog (+11/-0)
debian/patches/01-grid-fix-rev87.patch (+65/-0)
debian/patches/01_grid_defaults.patch (+0/-100)
debian/patches/series (+1/-2)
To merge this branch: bzr merge lp:~dbarth/compcomm-plugins-main/0.9.5.94-changes
Reviewer Review Type Date Requested Status
compiz packagers Pending
Review via email: mp+74795@code.launchpad.net

Description of the change

0.9.5.94

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-08-24 16:39:30 +0000
+++ debian/changelog 2011-09-09 14:08:22 +0000
@@ -1,3 +1,14 @@
1compiz-plugins-main (1:0.9.5.94-0ubuntu1~test2) oneiric; urgency=low
2
3 [ David Barth ]
4 * Test build for release (0.9.5.94)
5 * Removed patches integrated upstream:
6 - debian/patches/01_grid_defaults.patch
7 * Add another patch for the same grid, but with other changes
8 - debian/patches/01-grid-fix-rev87.patch: prevent eye bleeding
9
10 -- David Barth <david.barth@canonical.com> Thu, 08 Sep 2011 19:07:46 +0200
11
1compiz-plugins-main (0.9.5.92.bzr17-0ubuntu1) oneiric; urgency=low12compiz-plugins-main (0.9.5.92.bzr17-0ubuntu1) oneiric; urgency=low
213
3 * New upstream version14 * New upstream version
415
=== added file 'debian/patches/01-grid-fix-rev87.patch'
--- debian/patches/01-grid-fix-rev87.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/01-grid-fix-rev87.patch 2011-09-09 14:08:22 +0000
@@ -0,0 +1,65 @@
1=== modified file 'src/grid.cpp'
2--- compiz-plugins-main-0.9.5.94.orig/grid/src/grid.cpp 2011-08-25 10:50:22 +0000
3+++ compiz-plugins-main-0.9.5.94/grid/src/grid.cpp 2011-09-02 17:08:08 +0000
4@@ -377,9 +377,8 @@
5
6 for (iter = animations.begin (); iter != animations.end () && animating; iter++)
7 {
8- GLushort *color;
9 Animation& anim = *iter;
10- float alpha = (float) optionGetFillColorAlpha () / 65535.0f * anim.opacity;
11+ float alpha = ((float) optionGetFillColorAlpha () / 65535.0f) * anim.opacity;
12
13 /* fill rectangle */
14 glColor4f (((float) optionGetFillColorRed () / 65535.0f) * alpha,
15@@ -397,16 +396,13 @@
16 anim.currentRect.width () - 2,
17 anim.currentRect.height () - 2);
18
19- /* draw outline */
20- color = optionGetOutlineColor ();
21+ alpha = (float) (optionGetOutlineColorAlpha () / 65535.0f) * anim.opacity;
22
23 /* draw outline */
24 glColor4f (((float) optionGetOutlineColorRed () / 65535.0f) * alpha,
25 ((float) optionGetOutlineColorGreen () / 65535.0f) * alpha,
26 ((float) optionGetOutlineColorBlue () / 65535.0f) * alpha,
27- ((float) optionGetOutlineColorAlpha () / 65535.0f) * anim.opacity);
28-
29- glColor4us (color[0], color[1], color[2], anim.opacity * color[3]);
30+ alpha);
31
32 glLineWidth (2.0);
33
34@@ -421,7 +417,13 @@
35 if (!animating)
36 {
37 /* fill rectangle */
38- glColor4usv (optionGetFillColor ());
39+ float alpha = (float) optionGetFillColorAlpha () / 65535.0f;
40+
41+ /* fill rectangle */
42+ glColor4f (((float) optionGetFillColorRed () / 65535.0f) * alpha,
43+ ((float) optionGetFillColorGreen () / 65535.0f) * alpha,
44+ ((float) optionGetFillColorBlue () / 65535.0f) * alpha,
45+ alpha);
46 glRecti (rect.x1 (), rect.y2 (), rect.x2 (), rect.y1 ());
47
48 /* Set outline rect smaller to avoid damage issues */
49@@ -429,7 +431,14 @@
50 rect.width () - 2, rect.height () - 2);
51
52 /* draw outline */
53- glColor4usv (optionGetOutlineColor ());
54+ alpha = (float) optionGetOutlineColorAlpha () / 65535.0f;
55+
56+ /* draw outline */
57+ glColor4f (((float) optionGetOutlineColorRed () / 65535.0f) * alpha,
58+ ((float) optionGetOutlineColorGreen () / 65535.0f) * alpha,
59+ ((float) optionGetOutlineColorBlue () / 65535.0f) * alpha,
60+ alpha);
61+
62 glLineWidth (2.0);
63 glBegin (GL_LINE_LOOP);
64 glVertex2i (rect.x1 (), rect.y1 ());
65
066
=== removed file 'debian/patches/01_grid_defaults.patch'
--- debian/patches/01_grid_defaults.patch 2011-07-18 11:15:53 +0000
+++ debian/patches/01_grid_defaults.patch 1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
1Index: compiz-plugins-main-0.9.5.0/grid/grid.xml.in
2===================================================================
3--- compiz-plugins-main-0.9.5.0.orig/grid/grid.xml.in 2011-07-13 15:46:36.000000000 +0200
4+++ compiz-plugins-main-0.9.5.0/grid/grid.xml.in 2011-07-18 13:12:14.637756823 +0200
5@@ -84,7 +84,7 @@
6 <option name="top_left_corner_action" type="int">
7 <_short>Upper Left Corner</_short>
8 <_long>Action to be performed when window is dropped on the top left corner</_long>
9- <default>7</default>
10+ <default>4</default>
11 <min>0</min>
12 <max>10</max>
13 <desc>
14@@ -186,7 +186,7 @@
15 <option name="top_right_corner_action" type="int">
16 <_short>Upper Right Corner</_short>
17 <_long>Action to be performed when window is dropped on the top right corner</_long>
18- <default>9</default>
19+ <default>6</default>
20 <min>0</min>
21 <max>10</max>
22 <desc>
23@@ -339,7 +339,7 @@
24 <option name="bottom_left_corner_action" type="int">
25 <_short>Bottom Left Corner</_short>
26 <_long>Action to be performed when window is dropped on the bottom left corner</_long>
27- <default>1</default>
28+ <default>4</default>
29 <min>0</min>
30 <max>10</max>
31 <desc>
32@@ -390,7 +390,7 @@
33 <option name="bottom_edge_action" type="int">
34 <_short>Bottom Edge</_short>
35 <_long>Action to be performed when window is dropped on the bottom edge</_long>
36- <default>2</default>
37+ <default>0</default>
38 <min>0</min>
39 <max>10</max>
40 <desc>
41@@ -441,7 +441,7 @@
42 <option name="bottom_right_corner_action" type="int">
43 <_short>Bottom Right Corner</_short>
44 <_long>Action to be performed when window is dropped on the bottom right corner</_long>
45- <default>3</default>
46+ <default>6</default>
47 <min>0</min>
48 <max>10</max>
49 <desc>
50@@ -505,21 +505,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@@ -543,9 +543,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@@ -553,9 +553,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>
1010
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-08-24 16:37:36 +0000
+++ debian/patches/series 2011-09-09 14:08:22 +0000
@@ -1,2 +1,1 @@
101_grid_defaults.patch101-grid-fix-rev87.patch
2

Subscribers

People subscribed via source and target branches

to all changes: