Merge lp:~tpeeters/ubuntu-ui-toolkit/separatorOff into lp:ubuntu-ui-toolkit/staging

Proposed by Tim Peeters
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1303
Merged at revision: 1303
Proposed branch: lp:~tpeeters/ubuntu-ui-toolkit/separatorOff
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 23 lines (+6/-0)
1 file modified
modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+6/-0)
To merge this branch: bzr merge lp:~tpeeters/ubuntu-ui-toolkit/separatorOff
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Zsombor Egri Approve
Review via email: mp+239217@code.launchpad.net

Commit message

Add internal property to hide the header separator. Needed in Unity8.

To post a comment you must log in.
Revision history for this message
Zsombor Egri (zsombi) wrote :

Looks harmless :)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
2--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml 2014-10-16 11:03:56 +0000
3+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml 2014-10-22 15:40:45 +0000
4@@ -41,6 +41,11 @@
5 readonly property bool animating: headerStyle.state == "OUT"
6 || leftAnchor.anchors.leftMargin < 0
7
8+ // for Unity8
9+ // FIXME: Remove this property when we introduce a header preset that does not
10+ // have a separator.
11+ property alias __separator_visible: separator.visible
12+
13 BorderImage {
14 id: separator
15 anchors {
16@@ -123,6 +128,7 @@
17 right: parent.right
18 }
19 source: headerStyle.separatorBottomSource
20+ visible: separator.visible
21 }
22
23 states: [

Subscribers

People subscribed via source and target branches