git.iko.soy/unity8
on xenial help sign in
Adapted launcher-icon alert related qmltests, fixed general qml-warnings... QIODevice-warning still to sort out.
8f1adccMirco Müller
qml/Launcher/LauncherPanel.qml+3−3
compare with xenial
unifiedsplit
@@ -593,7 +593,7 @@ Rectangle {
593 Image {
593 Image {
594 anchors {
594 anchors {
595 left: parent.left
595 left: parent.left
596− leftMargin: (quickList.item.width - units.gu(1)) / 2 - width / 2
596+ leftMargin: quickList.item !== undefined ? (quickList.item.width - units.gu(1)) / 2 - width / 2 : 0
597 verticalCenter: parent.verticalCenter
597 verticalCenter: parent.verticalCenter
598 verticalCenterOffset: (parent.height / 2 + units.dp(3)) * (quickList.offset > 0 ? 1 : -1) * (root.inverted ? 1 : -1)
598 verticalCenterOffset: (parent.height / 2 + units.dp(3)) * (quickList.offset > 0 ? 1 : -1) * (root.inverted ? 1 : -1)
599 }
599 }
@@ -636,9 +636,9 @@ Rectangle {
636
636
637 // internal
637 // internal
638 property int itemCenter: item ? root.mapFromItem(quickList.item).y + (item.height / 2) : units.gu(1)
638 property int itemCenter: item ? root.mapFromItem(quickList.item).y + (item.height / 2) : units.gu(1)
639− property int offset: itemCenter + (item.height/2) + height + units.gu(1) > parent.height ?
639+ property int offset: item !== undefined ? (itemCenter + (item.height/2) + height + units.gu(1) > parent.height ?
640 -(item.height/2) - height - units.gu(.5) :
640 -(item.height/2) - height - units.gu(.5) :
641− (item.height/2) + units.gu(.5)
641+ (item.height/2) + units.gu(.5)) : 0
642
642
643 Column {
643 Column {
644 id: quickListColumn
644 id: quickListColumn
tests/qmltests/Launcher/tst_Launcher.qml+1−2
@@ -749,12 +749,11 @@ Item {
749 var listView = findChild(launcher, "launcherListView")
749 var listView = findChild(launcher, "launcherListView")
750 verify(listView != undefined)
750 verify(listView != undefined)
751 LauncherModel.setAlerting(LauncherModel.get(5).appId, true)
751 LauncherModel.setAlerting(LauncherModel.get(5).appId, true)
752− waitForWiggleToStart(appIcon5)
753 tryCompare(listView, "peekingIndex", 5, 1000, "Wrong appId set as peeking-index")
752 tryCompare(listView, "peekingIndex", 5, 1000, "Wrong appId set as peeking-index")
753+ waitForWiggleToStart(appIcon5)
754 tryCompare(appIcon5, "wiggling", true, 1000, "appId #6 should not be still")
754 tryCompare(appIcon5, "wiggling", true, 1000, "appId #6 should not be still")
755 dragLauncherIntoView();
755 dragLauncherIntoView();
756 tryCompare(listView, "peekingIndex", -1, 1000, "peeking-index should be -1")
756 tryCompare(listView, "peekingIndex", -1, 1000, "peeking-index should be -1")
757− tryCompare(appIcon5, "wiggling", true, 1000, "appId #1 should not be still")
758 LauncherModel.setAlerting(LauncherModel.get(5).appId, false)
757 LauncherModel.setAlerting(LauncherModel.get(5).appId, false)
759 waitForWiggleToStop(appIcon5)
758 waitForWiggleToStop(appIcon5)
760 tryCompare(appIcon5, "wiggling", false, 1000, "appId #1 should not be wiggling")
759 tryCompare(appIcon5, "wiggling", false, 1000, "appId #1 should not be wiggling")