← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/01_bzr_fix_grid_premultiply.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/01_bzr_fix_grid_premultiply.patch
 
1
=== modified file 'plugins/grid/src/grid.cpp'
 
2
--- a/plugins/grid/src/grid.cpp 2011-04-07 13:37:33 +0000
 
3
+++ b/plugins/grid/src/grid.cpp 2011-04-07 16:12:03 +0000
 
4
@@ -471,9 +471,9 @@
 
5
                          fill.width () - 2,fill. height () - 2);
 
6
 
 
7
        /* draw outline */
 
8
-       glColor4f ((float) gScreen->optionGetOutlineColorRed () / 65535.0f,
 
9
-                  (float) gScreen->optionGetOutlineColorGreen () / 65535.0f,
 
10
-                  (float) gScreen->optionGetOutlineColorBlue () / 65535.0f,
 
11
+       glColor4f (((float) gScreen->optionGetOutlineColorRed () / 65535.0f) * alpha,
 
12
+                  ((float) gScreen->optionGetOutlineColorGreen () / 65535.0f) * alpha,
 
13
+                  ((float) gScreen->optionGetOutlineColorBlue () / 65535.0f) * alpha,
 
14
                   ((float) gScreen->optionGetOutlineColorAlpha () / 65535.0f) * progress ());
 
15
        glLineWidth (2.0);
 
16
        glBegin (GL_LINE_LOOP);
 
17