7ac291a · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Merge el trunko

7ac291aAndrea Cimitan13 years ago

plugins/DashViews/listviewwithpageheader.cpp+6−1

compare with xenial

unifiedsplit

@@ -1148,7 +1148,12 @@ void ListViewWithPageHeader::adjustMinYExtent()

1148 nonCreatedHeight = m_firstVisibleIndex * visibleItemsHeight / visibleItems;

1149// qDebug() << m_firstVisibleIndex << visibleItemsHeight << visibleItems << nonCreatedHeight;

1150 }

1151− m_minYExtent = nonCreatedHeight - m_visibleItems.first()->y() - m_clipItem->y() + (m_headerItem ? m_headerItem->implicitHeight() : 0);

1151+ const qreal headerHeight = (m_headerItem ? m_headerItem->implicitHeight() : 0);

1152+ m_minYExtent = nonCreatedHeight - m_visibleItems.first()->y() - m_clipItem->y() + headerHeight;

1153+ if (m_minYExtent != 0 && qFuzzyIsNull(m_minYExtent)) {

1154+ m_minYExtent = 0;

1155+ m_visibleItems.first()->setY(nonCreatedHeight - m_clipItem->y() + headerHeight);

1156+ }

1152 }

1157 }

1153}

1158}

1154

1159

tests/qmltests/Launcher/tst_Launcher.qml+6−4

@@ -121,8 +121,7 @@ Item {

121 revealer.dragLauncherIntoView()

122

123 var listView = findChild(launcher, "launcherListView");

124− listView.flick(0, units.gu(500));

124+ listView.positionViewAtEnd();

125− tryCompare(listView, "flicking", false);

126

125

127 var appIcon = findChild(launcher, "launcherDelegate0")

126 var appIcon = findChild(launcher, "launcherDelegate0")

128

127

@@ -397,8 +396,11 @@ Item {

397

396

398 // Position launcher to where we need it

397 // Position launcher to where we need it

399 var listView = findChild(launcher, "launcherListView");

398 var listView = findChild(launcher, "launcherListView");

400− listView.flick(0, units.gu(200) * (data.flickTo === "top" ? 1 : -1));

399+ if (data.flickTo == "top") {

401− tryCompare(listView, "flicking", false);

400+ listView.positionViewAtEnd();

401+ } else {

402+ listView.positionViewAtBeginning();

403+ }

402

404

403 // Doing longpress

405 // Doing longpress

404 mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)

406 mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)