git.iko.soy/unity8
on xenial help sign in
Take into account the extra margin on top when calculating the display margin

Approved by: Michael Zanetti

commit2da8a8ff42f996a259e85e623d45b2b1eeb9fc58 authorAlbert Astals Cid <albert.astals@canonical.com> dateTue 16 Jun 2015, 15:12 (11 years ago) parent086eb861939d18
2 files changed+8−3
compare with xenial
unifiedsplit
qml/Components/ResponsiveVerticalJournal.qml+7−2 qml/Dash/GenericScopeView.qml+1−1
qml/Components/ResponsiveVerticalJournal.qml+7−2
@@ -39,6 +39,8 @@ import Dash 0.1
3939 +-----+
4040*/
4141Item {
42+ id: root
43+
4244 property real minimumColumnSpacing: units.gu(1)
4345
4446 property alias columnWidth: verticalJournalView.columnWidth
@@ -46,8 +48,8 @@ Item {
4648 property alias model: verticalJournalView.model
4749 property alias delegate: verticalJournalView.delegate
4850 property alias cacheBuffer: verticalJournalView.cacheBuffer
49− property alias displayMarginBeginning: verticalJournalView.displayMarginBeginning
50− property alias displayMarginEnd: verticalJournalView.displayMarginEnd
51+ property real displayMarginBeginning: 0
52+ property real displayMarginEnd: 0
5153
5254 implicitHeight: verticalJournalView.implicitHeight + rowSpacing
5355 clip: height < implicitHeight
@@ -63,6 +65,9 @@ Item {
6365 bottomMargin: rowSpacing / 2
6466 }
6567
68+ displayMarginBeginning: -Math.max(-root.displayMarginBeginning - anchors.topMargin, 0)
69+ displayMarginEnd:-Math.max(-root.displayMarginEnd - anchors.topMargin, 0)
70+
6671 function px2gu(pixels) {
6772 return Math.floor(pixels / units.gu(1))
6873 }
qml/Dash/GenericScopeView.qml+1−1
@@ -425,7 +425,7 @@ FocusScope {
425425 // to the next, we set the visible range to the viewport so
426426 // items are not culled (invisible) but still use no cacheBuffer
427427 // (it will be set once the scope is the current one)
428− var displayMarginBeginning = baseItem.y;
428+ var displayMarginBeginning = baseItem.y + rendererLoader.anchors.topMargin;
429429 displayMarginBeginning = -Math.max(-displayMarginBeginning, 0);
430430 displayMarginBeginning = -Math.min(-displayMarginBeginning, baseItem.height);
431431 displayMarginBeginning = Math.round(displayMarginBeginning);