on xenial help sign in
revert some unneeded change to shrink the diff and remove some debug stuff
3d9e5dcMichael Zanetti
Launcher/LauncherPanel.qml+1−1
@@ -109,10 +109,10 @@ Item {
109 height: parent.height - dashItem.height - parent.spacing*2
109 height: parent.height - dashItem.height - parent.spacing*2
110 model: root.model
110 model: root.model
111 cacheBuffer: itemSize * 3
111 cacheBuffer: itemSize * 3
112+ snapMode: ListView.SnapToItem
112 highlightRangeMode: ListView.ApplyRange
113 highlightRangeMode: ListView.ApplyRange
113 preferredHighlightBegin: (height - itemSize) / 2
114 preferredHighlightBegin: (height - itemSize) / 2
114 preferredHighlightEnd: (height + itemSize) / 2
115 preferredHighlightEnd: (height + itemSize) / 2
115− snapMode: ListView.SnapToItem
116
116
117 // The height of the area where icons start getting folded
117 // The height of the area where icons start getting folded
118 property int foldingAreaHeight: itemSize * 0.75
118 property int foldingAreaHeight: itemSize * 0.75
tests/qmltests/Launcher/tst_Launcher.qml−2
@@ -240,8 +240,6 @@ Item {
240 compare(root.height, units.gu(55));
240 compare(root.height, units.gu(55));
241
241
242 var listView = findChild(launcher, "launcherListView");
242 var listView = findChild(launcher, "launcherListView");
243− wait(1000);
244− print("humppa", listView.contentY, listView.topMargin)
245 compare(listView.contentY, -listView.topMargin, "Launcher did not start up with first item unfolded");
243 compare(listView.contentY, -listView.topMargin, "Launcher did not start up with first item unfolded");
246
244
247 // Now do check that snapping is in fact enabled
245 // Now do check that snapping is in fact enabled