Unity

Merge lp:~3v1n0/unity/decorations-transformated-vp into lp:unity

  1. decorations-transformated-vp
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Eleni Maria Stea
Approved revision: no longer in the source branch.
Merged at revision: 3886
Proposed branch: lp:~3v1n0/unity/decorations-transformated-vp
Merge into: lp:unity
Diff against target: 27 lines (+6/-2)
1 file modified
decorations/DecoratedWindow.cpp (+6/-2)
To merge this branch: bzr merge lp:~3v1n0/unity/decorations-transformated-vp
Reviewer Review Type Date Requested Status
Eleni Maria Stea (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+238966@code.launchpad.net

Commit message

Decorated Window: still paint decorations if on transformated windows in different workspaces

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3885
http://jenkins.qa.ubuntu.com/job/unity-ci/1104/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/191

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1104/rebuild

review: Approve (continuous-integration)
Revision history for this message
Eleni Maria Stea (hikiko) wrote :

Thank you! :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'decorations/DecoratedWindow.cpp'
--- decorations/DecoratedWindow.cpp 2014-10-01 16:48:15 +0000
+++ decorations/DecoratedWindow.cpp 2014-10-20 20:43:26 +0000
@@ -620,8 +620,10 @@
620 GLWindowPaintAttrib const& attrib,620 GLWindowPaintAttrib const& attrib,
621 CompRegion const& region, unsigned mask)621 CompRegion const& region, unsigned mask)
622{622{
623 if (win_->defaultViewport() != screen->vp())623 if (!(mask & PAINT_SCREEN_TRANSFORMED_MASK) && win_->defaultViewport() != screen->vp())
624 {
624 return;625 return;
626 }
625627
626 if (dirty_geo_)628 if (dirty_geo_)
627 parent_->UpdateDecorationPosition();629 parent_->UpdateDecorationPosition();
@@ -639,8 +641,10 @@
639 GLWindowPaintAttrib const& attrib,641 GLWindowPaintAttrib const& attrib,
640 CompRegion const& region, unsigned mask)642 CompRegion const& region, unsigned mask)
641{643{
642 if (last_shadow_rect_.isEmpty() || win_->defaultViewport() != screen->vp())644 if (last_shadow_rect_.isEmpty() || (!(mask & PAINT_SCREEN_TRANSFORMED_MASK) && win_->defaultViewport() != screen->vp()))
645 {
643 return;646 return;
647 }
644648
645 auto const& clip_region = (mask & PAINT_WINDOW_TRANSFORMED_MASK) ? infiniteRegion : region;649 auto const& clip_region = (mask & PAINT_WINDOW_TRANSFORMED_MASK) ? infiniteRegion : region;
646 mask |= PAINT_WINDOW_BLEND_MASK;650 mask |= PAINT_WINDOW_BLEND_MASK;