Merge lp:~aacid/unity8/vj_reset_cardtool_settle into lp:unity8

Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 1367
Merged at revision: 1379
Proposed branch: lp:~aacid/unity8/vj_reset_cardtool_settle
Merge into: lp:unity8
Diff against target: 26 lines (+17/-0)
1 file modified
qml/Dash/CardVerticalJournal.qml (+17/-0)
To merge this branch: bzr merge lp:~aacid/unity8/vj_reset_cardtool_settle
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michał Sawicz code Approve
Review via email: mp+238461@code.launchpad.net

Commit message

Reset VerticalJournal until the cardTool settles

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Will do in silo.
 * Did CI run pass? If not, please explain why.
Not yet, expecting AP failures though.
 * Did you make sure that the branch does not contain spurious tags?
Yes.

Could use a test probably.

review: Approve (code)
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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qml/Dash/CardVerticalJournal.qml'
--- qml/Dash/CardVerticalJournal.qml 2014-09-30 09:23:23 +0000
+++ qml/Dash/CardVerticalJournal.qml 2014-10-15 15:05:49 +0000
@@ -33,6 +33,23 @@
33 // in case the model is non empty33 // in case the model is non empty
34 readonly property double minHeight: root.model.count >= 1 ? cardVerticalJournal.rowSpacing + 1 : 034 readonly property double minHeight: root.model.count >= 1 ? cardVerticalJournal.rowSpacing + 1 : 0
3535
36 function clearView() {
37 cardVerticalJournal.model = null;
38 cardVerticalJournal.model = root.model;
39 }
40
41 // Clear the view if the cardTool changes its sizes
42 // means it is still settling. This is
43 // necessary because the VerticalJournal does
44 // not support its elements changing height so
45 // we need to construct all the items with the settled
46 // size of the cardTool
47 Connections {
48 target: cardTool
49 onArtShapeSizeChanged: root.clearView();
50 onHeaderHeightChanged: root.clearView();
51 }
52
36 ResponsiveVerticalJournal {53 ResponsiveVerticalJournal {
37 id: cardVerticalJournal54 id: cardVerticalJournal
3855

Subscribers

People subscribed via source and target branches