git.iko.soy/unity8
on xenial help sign in
Merge el trunko
commit7ac291a7cb14b92daf0bf8899c46df1709233626 authorAndrea Cimitan <andrea.cimitan@canonical.com> dateFri 14 Mar 2014, 12:44 (13 years ago) parent90a0c16aabfc41
2 files changed+12−5
compare with xenial
unifiedsplit
plugins/DashViews/listviewwithpageheader.cpp+6−1 tests/qmltests/Launcher/tst_Launcher.qml+6−4
plugins/DashViews/listviewwithpageheader.cpp+6−1
@@ -1148,7 +1148,12 @@ void ListViewWithPageHeader::adjustMinYExtent()
11481148 nonCreatedHeight = m_firstVisibleIndex * visibleItemsHeight / visibleItems;
11491149// qDebug() << m_firstVisibleIndex << visibleItemsHeight << visibleItems << nonCreatedHeight;
11501150 }
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+ }
11521157 }
11531158}
11541159
tests/qmltests/Launcher/tst_Launcher.qml+6−4
@@ -121,8 +121,7 @@ Item {
121121 revealer.dragLauncherIntoView()
122122
123123 var listView = findChild(launcher, "launcherListView");
124− listView.flick(0, units.gu(500));
125− tryCompare(listView, "flicking", false);
124+ listView.positionViewAtEnd();
126125
127126 var appIcon = findChild(launcher, "launcherDelegate0")
128127
@@ -397,8 +396,11 @@ Item {
397396
398397 // Position launcher to where we need it
399398 var listView = findChild(launcher, "launcherListView");
400− listView.flick(0, units.gu(200) * (data.flickTo === "top" ? 1 : -1));
401− tryCompare(listView, "flicking", false);
399+ if (data.flickTo == "top") {
400+ listView.positionViewAtEnd();
401+ } else {
402+ listView.positionViewAtBeginning();
403+ }
402404
403405 // Doing longpress
404406 mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)