Merge lp:~zsombi/ubuntu-ui-toolkit/sheet-title-fix into lp:ubuntu-ui-toolkit/staging

Proposed by Zsombor Egri
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1229
Merged at revision: 1247
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/sheet-title-fix
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 20 lines (+2/-2)
1 file modified
modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml (+2/-2)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/sheet-title-fix
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Tim Peeters Needs Fixing
Review via email: mp+233053@code.launchpad.net

Commit message

Sheet header button space reservation made button presence dependent.

To post a comment you must log in.
Revision history for this message
Tim Peeters (tpeeters) wrote :

thanks

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

The failure of ubuntuuitoolkit.tests.custom_proxy_objects.test_pull_to_refresh.PullToRefreshTestCase.test_pull_to_refresh_must_refresh_model is very consistent in this MR.

Revision history for this message
Tim Peeters (tpeeters) :
review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
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/Themes/Ambiance/SheetForegroundStyle.qml'
2--- modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml 2014-04-23 08:50:20 +0000
3+++ modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml 2014-09-09 05:24:15 +0000
4@@ -60,7 +60,7 @@
5 top: parent.top
6 bottom: parent.bottom
7 }
8- width: visuals.buttonContainerWidth
9+ width: styledItem.leftButton ? visuals.buttonContainerWidth : 0
10 Component.onCompleted: header.updateButton(styledItem.leftButton, leftButtonContainer)
11 }
12
13@@ -71,7 +71,7 @@
14 top: parent.top
15 bottom: parent.bottom
16 }
17- width: visuals.buttonContainerWidth
18+ width: styledItem.rightButton ? visuals.buttonContainerWidth : 0
19 Component.onCompleted: header.updateButton(styledItem.rightButton, rightButtonContainer)
20 }
21

Subscribers

People subscribed via source and target branches