Unity

Merge lp:~3v1n0/unity/use-new-compregion into lp:unity

  1. use-new-compregion
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 4268
Proposed branch: lp:~3v1n0/unity/use-new-compregion
Merge into: lp:unity
Diff against target: 53 lines (+6/-4)
4 files modified
debian/control (+1/-1)
decorations/DecoratedWindow.cpp (+3/-1)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp (+1/-1)
plugins/unityshell/src/unityshell.cpp (+1/-1)
To merge this branch: bzr merge lp:~3v1n0/unity/use-new-compregion
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Review via email: mp+338430@code.launchpad.net

Commit message

Unity: use new definition of infinite CompRegion's

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2017-09-22 03:01:25 +0000
+++ debian/control 2018-02-21 14:48:40 +0000
@@ -3,7 +3,7 @@
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Build-Depends: cmake,5Build-Depends: cmake,
6 compiz-dev (>= 1:0.9.13.1+17.10.20170829),6 compiz-dev (>= 1:0.9.13.1+18.04.20180221),
7 debhelper (>= 9.0.0~),7 debhelper (>= 9.0.0~),
8 dbus-test-runner,8 dbus-test-runner,
9 dbus-x11,9 dbus-x11,
1010
=== modified file 'decorations/DecoratedWindow.cpp'
--- decorations/DecoratedWindow.cpp 2016-08-29 17:43:07 +0000
+++ decorations/DecoratedWindow.cpp 2018-02-21 14:48:40 +0000
@@ -816,7 +816,9 @@
816 return;816 return;
817 }817 }
818818
819 auto const& clip_region = (mask & PAINT_WINDOW_TRANSFORMED_MASK) ? infiniteRegion : region;819 auto const& clip_region = (mask & PAINT_WINDOW_TRANSFORMED_MASK) ?
820 CompRegion::infinite() : region;
821
820 mask |= PAINT_WINDOW_BLEND_MASK;822 mask |= PAINT_WINDOW_BLEND_MASK;
821823
822 if (win_->alpha() || attrib.opacity != OPAQUE)824 if (win_->alpha() || attrib.opacity != OPAQUE)
823825
=== modified file 'plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp'
--- plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp 2013-11-17 18:12:54 +0000
+++ plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp 2018-02-21 14:48:40 +0000
@@ -480,7 +480,7 @@
480 matl.push_back(mat);480 matl.push_back(mat);
481481
482 if (mask & PAINT_WINDOW_TRANSFORMED_MASK)482 if (mask & PAINT_WINDOW_TRANSFORMED_MASK)
483 paintRegion = infiniteRegion;483 paintRegion = CompRegion::infinite();
484484
485 /* Now allow plugins to mess with the geometry of our485 /* Now allow plugins to mess with the geometry of our
486 * dim (so we get a nice render for things like486 * dim (so we get a nice render for things like
487487
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp 2017-09-19 18:09:41 +0000
+++ plugins/unityshell/src/unityshell.cpp 2018-02-21 14:48:40 +0000
@@ -979,7 +979,7 @@
979 /* force the use of the core functions */979 /* force the use of the core functions */
980 uTrayWindow->gWindow->glDrawSetCurrentIndex (MAXSHORT);980 uTrayWindow->gWindow->glDrawSetCurrentIndex (MAXSHORT);
981 uTrayWindow->gWindow->glAddGeometrySetCurrentIndex ( MAXSHORT);981 uTrayWindow->gWindow->glAddGeometrySetCurrentIndex ( MAXSHORT);
982 uTrayWindow->gWindow->glDraw (oTransform, attrib, infiniteRegion,982 uTrayWindow->gWindow->glDraw (oTransform, attrib, CompRegion::infinite (),
983 PAINT_WINDOW_TRANSFORMED_MASK |983 PAINT_WINDOW_TRANSFORMED_MASK |
984 PAINT_WINDOW_BLEND_MASK |984 PAINT_WINDOW_BLEND_MASK |
985 PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK);985 PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK);