Merge lp:~cimi/unity/unity.fix-940493 into lp:unity

Proposed by Andrea Cimitan
Status: Merged
Approved by: Andrea Cimitan
Approved revision: no longer in the source branch.
Merged at revision: 2121
Proposed branch: lp:~cimi/unity/unity.fix-940493
Merge into: lp:unity
Diff against target: 18 lines (+1/-1)
1 file modified
plugins/unityshell/src/UnityWindowView.cpp (+1/-1)
To merge this branch: bzr merge lp:~cimi/unity/unity.fix-940493
Reviewer Review Type Date Requested Status
Jay Taoko (community) Approve
Review via email: mp+97914@code.launchpad.net

Commit message

Remove internal UnityWindow shadow and use new 5px nux mask - requires new nux!

Description of the change

Fixes bug 940493 by updating the assets to remove the internal shadow, and using new nux 5px mask from nux branch https://code.launchpad.net/~unity-team/nux/nux.round-corner-assets.

No test required, visuals signed-off by design.

To post a comment you must log in.
Revision history for this message
Jay Taoko (jaytaoko) :
review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/484/console reported an error when processing this lp:~cimi/unity/unity.fix-940493 branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/resources/switcher_corner.png'
2Binary files plugins/unityshell/resources/switcher_corner.png 2011-09-22 21:17:25 +0000 and plugins/unityshell/resources/switcher_corner.png 2012-03-16 16:14:25 +0000 differ
3=== modified file 'plugins/unityshell/resources/switcher_left.png'
4Binary files plugins/unityshell/resources/switcher_left.png 2011-09-22 21:17:25 +0000 and plugins/unityshell/resources/switcher_left.png 2012-03-16 16:14:25 +0000 differ
5=== modified file 'plugins/unityshell/resources/switcher_top.png'
6Binary files plugins/unityshell/resources/switcher_top.png 2011-09-22 21:17:25 +0000 and plugins/unityshell/resources/switcher_top.png 2012-03-16 16:14:25 +0000 differ
7=== modified file 'plugins/unityshell/src/UnityWindowView.cpp'
8--- plugins/unityshell/src/UnityWindowView.cpp 2012-01-30 00:44:57 +0000
9+++ plugins/unityshell/src/UnityWindowView.cpp 2012-03-16 16:14:25 +0000
10@@ -107,7 +107,7 @@
11 gPainter.PaintShapeCornerROP(GfxContext,
12 internal_clip,
13 nux::color::White,
14- nux::eSHAPE_CORNER_ROUND4,
15+ nux::eSHAPE_CORNER_ROUND5,
16 nux::eCornerTopLeft | nux::eCornerTopRight |
17 nux::eCornerBottomLeft | nux::eCornerBottomRight,
18 true,