Merge lp:~tpeeters/ubuntu-ui-toolkit/fix1209403 into lp:ubuntu-ui-toolkit

Proposed by Tim Peeters
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 695
Merged at revision: 694
Proposed branch: lp:~tpeeters/ubuntu-ui-toolkit/fix1209403
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 27 lines (+2/-1)
2 files modified
modules/Ubuntu/Components/TabBar.qml (+1/-1)
modules/Ubuntu/Components/Tabs.qml (+1/-0)
To merge this branch: bzr merge lp:~tpeeters/ubuntu-ui-toolkit/fix1209403
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu SDK team Pending
Review via email: mp+180245@code.launchpad.net

Description of the change

Fix bug 1209403 where Tabs header does not become invisible when another page is pushed on the PageStack and a gradient background is used.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (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/TabBar.qml'
2--- modules/Ubuntu/Components/TabBar.qml 2013-08-01 13:17:28 +0000
3+++ modules/Ubuntu/Components/TabBar.qml 2013-08-14 21:37:25 +0000
4@@ -27,10 +27,10 @@
5 StyledItem {
6 id: tabBar
7 anchors.fill: parent
8- visible: parent
9
10 // HeaderStyle binds parent when the TabBar should be visible
11 parent: null
12+ // TabBar visibility is set in Tabs depending on whether the Tabs are active.
13
14 /*!
15 The \l Tabs item that tab bar belongs to.
16
17=== modified file 'modules/Ubuntu/Components/Tabs.qml'
18--- modules/Ubuntu/Components/Tabs.qml 2013-07-25 15:20:29 +0000
19+++ modules/Ubuntu/Components/Tabs.qml 2013-08-14 21:37:25 +0000
20@@ -175,6 +175,7 @@
21 */
22 property TabBar tabBar: TabBar {
23 tabsItem: tabs
24+ visible: tabs.active
25 }
26
27 /*!

Subscribers

People subscribed via source and target branches

to status/vote changes: