Merge lp://qastaging/~3v1n0/unity/spread-title-improved into lp://qastaging/unity

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 2668
Proposed branch: lp://qastaging/~3v1n0/unity/spread-title-improved
Merge into: lp://qastaging/unity
Prerequisite: lp://qastaging/~renatofilho/unity/unity-lp876017-fixes
Diff against target: 1202 lines (+387/-393)
2 files modified
plugins/unityshell/src/unityshell.cpp (+366/-367)
plugins/unityshell/src/unityshell.h (+21/-26)
To merge this branch: bzr merge lp://qastaging/~3v1n0/unity/spread-title-improved
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Needs Fixing
Renato Araujo Oliveira Filho (community) Approve
Review via email: mp+122782@code.qastaging.launchpad.net

Commit message

UnityWindow: use smart pointers, use static close_icon (with dynamic state) and PanelStyle context

Description of the change

Improved the UnityWindow code used to handle the spread icons, I've changed the way we draw our fake decoration (I made it to be above the standard one) and added support for close button states (normal, prelighted and pressed).
Also, some code optimizations to avoid that shared resources are re-computed more than needed.

Shot: http://i.imgur.com/NAETd.jpg

To post a comment you must log in.
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

looks ok for me.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The prerequisite lp:~renatofilho/unity/unity-lp876017-fixes has not yet been merged into lp:unity.

Revision history for this message
Unity Merger (unity-merger) wrote :

The prerequisite lp:~renatofilho/unity/unity-lp876017-fixes has not yet been merged into lp:unity.

Revision history for this message
Unity Merger (unity-merger) wrote :

The prerequisite lp:~renatofilho/unity/unity-lp876017-fixes has not yet been merged into lp:unity.

Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/11/

review: Needs Fixing (continuous-integration)
Revision history for this message
Martin Mrazik (mrazik) wrote :

There is a conflict:

Retrieving 'bzr+ssh://bazaar.launchpad.net/~3v1n0/unity/spread-title-improved' to put at 'work'.
Merging 'lp:unity' in to 'work'.
Warning: criss-cross merge encountered. See bzr help criss-cross.
Text conflict in plugins/unityshell/src/unityshell.cpp
1 conflicts encountered.
bzr: ERROR: Conflicts from merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.