David Barth has proposed merging lp:~dbarth/compcomm-plugins-main/0.9.5.94-changes into lp:~compiz/compcomm-plugins-main/ubuntu.
Requested reviews: compiz packagers (compiz) For more details, see: https://code.launchpad.net/~dbarth/compcomm-plugins-main/0.9.5.94-changes/+merge/74795 0.9.5.94 -- https://code.launchpad.net/~dbarth/compcomm-plugins-main/0.9.5.94-changes/+merge/74795 Your team compiz packagers is requested to review the proposed merge of lp:~dbarth/compcomm-plugins-main/0.9.5.94-changes into lp:~compiz/compcomm-plugins-main/ubuntu.
=== 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 @@ +compiz-plugins-main (1:0.9.5.94-0ubuntu1~test2) oneiric; urgency=low + + [ David Barth ] + * Test build for release (0.9.5.94) + * Removed patches integrated upstream: + - debian/patches/01_grid_defaults.patch + * Add another patch for the same grid, but with other changes + - debian/patches/01-grid-fix-rev87.patch: prevent eye bleeding + + -- David Barth <[email protected]> Thu, 08 Sep 2011 19:07:46 +0200 + compiz-plugins-main (0.9.5.92.bzr17-0ubuntu1) oneiric; urgency=low * New upstream version === 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 @@ +=== modified file 'src/grid.cpp' +--- compiz-plugins-main-0.9.5.94.orig/grid/src/grid.cpp 2011-08-25 10:50:22 +0000 ++++ compiz-plugins-main-0.9.5.94/grid/src/grid.cpp 2011-09-02 17:08:08 +0000 +@@ -377,9 +377,8 @@ + + for (iter = animations.begin (); iter != animations.end () && animating; iter++) + { +- GLushort *color; + Animation& anim = *iter; +- float alpha = (float) optionGetFillColorAlpha () / 65535.0f * anim.opacity; ++ float alpha = ((float) optionGetFillColorAlpha () / 65535.0f) * anim.opacity; + + /* fill rectangle */ + glColor4f (((float) optionGetFillColorRed () / 65535.0f) * alpha, +@@ -397,16 +396,13 @@ + anim.currentRect.width () - 2, + anim.currentRect.height () - 2); + +- /* draw outline */ +- color = optionGetOutlineColor (); ++ alpha = (float) (optionGetOutlineColorAlpha () / 65535.0f) * anim.opacity; + + /* draw outline */ + glColor4f (((float) optionGetOutlineColorRed () / 65535.0f) * alpha, + ((float) optionGetOutlineColorGreen () / 65535.0f) * alpha, + ((float) optionGetOutlineColorBlue () / 65535.0f) * alpha, +- ((float) optionGetOutlineColorAlpha () / 65535.0f) * anim.opacity); +- +- glColor4us (color[0], color[1], color[2], anim.opacity * color[3]); ++ alpha); + + glLineWidth (2.0); + +@@ -421,7 +417,13 @@ + if (!animating) + { + /* fill rectangle */ +- glColor4usv (optionGetFillColor ()); ++ float alpha = (float) optionGetFillColorAlpha () / 65535.0f; ++ ++ /* fill rectangle */ ++ glColor4f (((float) optionGetFillColorRed () / 65535.0f) * alpha, ++ ((float) optionGetFillColorGreen () / 65535.0f) * alpha, ++ ((float) optionGetFillColorBlue () / 65535.0f) * alpha, ++ alpha); + glRecti (rect.x1 (), rect.y2 (), rect.x2 (), rect.y1 ()); + + /* Set outline rect smaller to avoid damage issues */ +@@ -429,7 +431,14 @@ + rect.width () - 2, rect.height () - 2); + + /* draw outline */ +- glColor4usv (optionGetOutlineColor ()); ++ alpha = (float) optionGetOutlineColorAlpha () / 65535.0f; ++ ++ /* draw outline */ ++ glColor4f (((float) optionGetOutlineColorRed () / 65535.0f) * alpha, ++ ((float) optionGetOutlineColorGreen () / 65535.0f) * alpha, ++ ((float) optionGetOutlineColorBlue () / 65535.0f) * alpha, ++ alpha); ++ + glLineWidth (2.0); + glBegin (GL_LINE_LOOP); + glVertex2i (rect.x1 (), rect.y1 ()); + === 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 @@ -Index: compiz-plugins-main-0.9.5.0/grid/grid.xml.in -=================================================================== ---- compiz-plugins-main-0.9.5.0.orig/grid/grid.xml.in 2011-07-13 15:46:36.000000000 +0200 -+++ compiz-plugins-main-0.9.5.0/grid/grid.xml.in 2011-07-18 13:12:14.637756823 +0200 -@@ -84,7 +84,7 @@ - <option name="top_left_corner_action" type="int"> - <_short>Upper Left Corner</_short> - <_long>Action to be performed when window is dropped on the top left corner</_long> -- <default>7</default> -+ <default>4</default> - <min>0</min> - <max>10</max> - <desc> -@@ -186,7 +186,7 @@ - <option name="top_right_corner_action" type="int"> - <_short>Upper Right Corner</_short> - <_long>Action to be performed when window is dropped on the top right corner</_long> -- <default>9</default> -+ <default>6</default> - <min>0</min> - <max>10</max> - <desc> -@@ -339,7 +339,7 @@ - <option name="bottom_left_corner_action" type="int"> - <_short>Bottom Left Corner</_short> - <_long>Action to be performed when window is dropped on the bottom left corner</_long> -- <default>1</default> -+ <default>4</default> - <min>0</min> - <max>10</max> - <desc> -@@ -390,7 +390,7 @@ - <option name="bottom_edge_action" type="int"> - <_short>Bottom Edge</_short> - <_long>Action to be performed when window is dropped on the bottom edge</_long> -- <default>2</default> -+ <default>0</default> - <min>0</min> - <max>10</max> - <desc> -@@ -441,7 +441,7 @@ - <option name="bottom_right_corner_action" type="int"> - <_short>Bottom Right Corner</_short> - <_long>Action to be performed when window is dropped on the bottom right corner</_long> -- <default>3</default> -+ <default>6</default> - <min>0</min> - <max>10</max> - <desc> -@@ -505,21 +505,21 @@ - <option name="left_edge_threshold" type="int"> - <_short>Left Edge</_short> - <_long>Maximum number of pixels from the left edge a window can be dropped</_long> -- <default>5</default> -+ <default>15</default> - <min>0</min> - <max>500</max> - </option> - <option name="right_edge_threshold" type="int"> - <_short>Right Edge</_short> - <_long>Maximum number of pixels from the right edge a window can be dropped</_long> -- <default>5</default> -+ <default>15</default> - <min>0</min> - <max>500</max> - </option> - <option name="top_edge_threshold" type="int"> - <_short>Top Edge</_short> - <_long>Maximum number of pixels from the top edge a window can be dropped</_long> -- <default>5</default> -+ <default>20</default> - <min>0</min> - <max>500</max> - </option> -@@ -543,9 +543,9 @@ - <_short>Outline Color</_short> - <_long>Color of the resize indicator outline</_long> - <default> -- <red>0x2f2f</red> -- <green>0x2f2f</green> -- <blue>0x4f4f</blue> -+ <red>0xfbfb</red> -+ <green>0x8b8b</green> -+ <blue>0x0</blue> - <alpha>0x9f9f</alpha> - </default> - </option> -@@ -553,9 +553,9 @@ - <_short>Fill Color</_short> - <_long>Fill color of the resize indicator</_long> - <default> -- <red>0x2f2f</red> -- <green>0x2f2f</green> -- <blue>0x4f4f</blue> -+ <red>0xfbfb</red> -+ <green>0x8b8b</green> -+ <blue>0x0</blue> - <alpha>0x4f4f</alpha> - </default> - </option> === 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 @@ -01_grid_defaults.patch - +01-grid-fix-rev87.patch
_______________________________________________ Mailing list: https://launchpad.net/~compiz Post to : [email protected] Unsubscribe : https://launchpad.net/~compiz More help : https://help.launchpad.net/ListHelp
