0aac348 · unity8 · git.iko.soy

qml/Components/FilterGrid.qml+1

compare with xenial

unifiedsplit

@@ -59,6 +59,7 @@ Item {

59 property alias cellHeight: iconTileGrid.cellHeight

60 property alias delegateCreationBegin: iconTileGrid.delegateCreationBegin

61 property alias delegateCreationEnd: iconTileGrid.delegateCreationEnd

62+ readonly property alias originY: iconTileGrid.originY

62 readonly property alias flicking: iconTileGrid.flicking

63 readonly property alias flicking: iconTileGrid.flicking

63 readonly property alias moving: iconTileGrid.moving

64 readonly property alias moving: iconTileGrid.moving

64 readonly property alias pressDelay: iconTileGrid.pressDelay

65 readonly property alias pressDelay: iconTileGrid.pressDelay

qml/Components/ResponsiveGridView.qml+1

@@ -40,6 +40,7 @@ Item {

40 readonly property alias flicking: gridView.flicking

41 readonly property alias moving: gridView.moving

42 readonly property alias pressDelay: gridView.pressDelay

43+ readonly property alias originY: gridView.originY

43 property alias delegateCreationBegin: gridView.delegateCreationBegin

44 property alias delegateCreationBegin: gridView.delegateCreationBegin

44 property alias delegateCreationEnd: gridView.delegateCreationEnd

45 property alias delegateCreationEnd: gridView.delegateCreationEnd

45 property alias highlightIndex: gridView.highlightIndex

46 property alias highlightIndex: gridView.highlightIndex

qml/Dash/CardFilterGrid.qml+1

@@ -24,6 +24,7 @@ DashRenderer {

24 collapsedHeight: filterGrid.collapsedHeight

25 margins: filterGrid.margins

26 uncollapsedHeight: filterGrid.uncollapsedHeight

27+ originY: filterGrid.originY

27 verticalSpacing: units.gu(1)

28 verticalSpacing: units.gu(1)

28 currentItem: filterGrid.currentItem

29 currentItem: filterGrid.currentItem

29 height: filterGrid.height

30 height: filterGrid.height

qml/Dash/DashRenderer.qml+2

@@ -33,6 +33,8 @@ Item {

33

34 property var delegateCreationEnd: undefined

35

36+ property real originY: 0

37+

36 property real verticalSpacing: 0

38 property real verticalSpacing: 0

37

39

38 // The current item of the renderer

40 // The current item of the renderer

qml/Dash/GenericScopeView.qml+8−8

@@ -247,16 +247,16 @@ FocusScope {

247

248 if (item && item.hasOwnProperty("delegateCreationBegin")) {

249 if (baseItem.y + baseItem.height <= 0) {

250− // Not visible (item at top of the list)

250+ // Not visible (item at top of the list viewport)

251− item.delegateCreationBegin = baseItem.height

251+ item.delegateCreationBegin = item.originY + baseItem.height

252− item.delegateCreationEnd = baseItem.height

252+ item.delegateCreationEnd = item.originY + baseItem.height

253 } else if (baseItem.y >= categoryView.height) {

254− // Not visible (item at bottom of the list)

254+ // Not visible (item at bottom of the list viewport)

255− item.delegateCreationBegin = 0

255+ item.delegateCreationBegin = item.originY

256− item.delegateCreationEnd = 0

256+ item.delegateCreationEnd = item.originY

257 } else {

258− item.delegateCreationBegin = Math.max(-baseItem.y, 0)

258+ item.delegateCreationBegin = item.originY + Math.max(-baseItem.y, 0)

259− item.delegateCreationEnd = Math.min(categoryView.height + item.delegateCreationBegin, baseItem.height)

259+ item.delegateCreationEnd = item.originY + Math.min(categoryView.height + item.delegateCreationBegin, baseItem.height)

260 }

261 }

262 }