diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2018-02-21 15:27:05 +0000 |
|---|---|---|
| committer | Bileto Bot <ci-train-bot@canonical.com> | 2018-02-21 15:27:05 +0000 |
| commit | 1c79b6c320c8605bf26c3eef9e08f47d561db606 (patch) | |
| tree | 173d32667cbd41afffa531a3e1b5fe833c717e98 | |
| parent | 8cfd8242218d4f3ccba88b81921fa46e67df11b5 (diff) | |
| parent | ef04f621e61076ef317e08b941b0e1a5d7cae937 (diff) | |
Unity: use new definition of infinite CompRegion's (LP: #1749957)
Approved by: Andrea Azzarone (bzr r4268)
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | decorations/DecoratedWindow.cpp | 4 | ||||
| -rw-r--r-- | plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp | 2 | ||||
| -rw-r--r-- | plugins/unityshell/src/unityshell.cpp | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/debian/control b/debian/control index f61138fde..75358d7aa 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: gnome Priority: optional Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Build-Depends: cmake, - compiz-dev (>= 1:0.9.13.1+17.10.20170829), + compiz-dev (>= 1:0.9.13.1+18.04.20180221), debhelper (>= 9.0.0~), dbus-test-runner, dbus-x11, diff --git a/decorations/DecoratedWindow.cpp b/decorations/DecoratedWindow.cpp index fe294dc83..ed5548f5e 100644 --- a/decorations/DecoratedWindow.cpp +++ b/decorations/DecoratedWindow.cpp @@ -816,7 +816,9 @@ void Window::Impl::Draw(GLMatrix const& transformation, return; } - auto const& clip_region = (mask & PAINT_WINDOW_TRANSFORMED_MASK) ? infiniteRegion : region; + auto const& clip_region = (mask & PAINT_WINDOW_TRANSFORMED_MASK) ? + CompRegion::infinite() : region; + mask |= PAINT_WINDOW_BLEND_MASK; if (win_->alpha() || attrib.opacity != OPAQUE) diff --git a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp index 08b811e02..fb78bd9d8 100644 --- a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp +++ b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp @@ -480,7 +480,7 @@ UnityMTGrabHandlesWindow::glDraw(const GLMatrix& transform, matl.push_back(mat); if (mask & PAINT_WINDOW_TRANSFORMED_MASK) - paintRegion = infiniteRegion; + paintRegion = CompRegion::infinite(); /* Now allow plugins to mess with the geometry of our * dim (so we get a nice render for things like diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index 4e91d434f..ff739f6d6 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -979,7 +979,7 @@ void UnityScreen::paintOutput() /* force the use of the core functions */ uTrayWindow->gWindow->glDrawSetCurrentIndex (MAXSHORT); uTrayWindow->gWindow->glAddGeometrySetCurrentIndex ( MAXSHORT); - uTrayWindow->gWindow->glDraw (oTransform, attrib, infiniteRegion, + uTrayWindow->gWindow->glDraw (oTransform, attrib, CompRegion::infinite (), PAINT_WINDOW_TRANSFORMED_MASK | PAINT_WINDOW_BLEND_MASK | PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK); |