git.iko.soy/unity8
on xenial help sign in
PhoneStage tests passing again!
commit0cc0513c5a62b2e671459c9264276a7a4d95323f authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 15 Sep 2016, 14:37 (10 years ago) parent81bfaa2
2 files changed+6−6
compare with xenial
unifiedsplit
qml/Shell.qml+3−3 tests/qmltests/Stage/tst_PhoneStage.qml+3−3
qml/Shell.qml+3−3
@@ -278,8 +278,9 @@ StyledItem {
278278 focus: true
279279
280280 dragAreaWidth: shell.edgeSize
281− background: wallpaperResolver.background
282− leftEdgeDragProgress: Math.max(0, (launcher.dragDistance * (stage.width - launcher.panelWidth) / stage.width) - launcher.panelWidth)
281+ background: wallpaperResolver.background
282+ leftEdgeDragProgress: !greeter || greeter.locked || !tutorial.launcherLongSwipeEnabled ? 0 :
283+ Math.max(0, (launcher.dragDistance * (stage.width - launcher.panelWidth) / stage.width) - launcher.panelWidth)
283284
284285 applicationManager: ApplicationManager
285286 topLevelSurfaceList: topLevelSurfaceList
@@ -318,7 +319,6 @@ StyledItem {
318319 leftMargin: shell.usageScenario == "desktop" && !settings.autohideLauncher ? launcher.panelWidth: 0
319320
320321 // TODO: this is not implemented yet in the new stage...
321− inverseProgress: !greeter || greeter.locked || !tutorial.launcherLongSwipeEnabled ? 0 : launcher.progress
322322 altTabPressed: physicalKeysMapper.altTabPressed
323323 oskEnabled: shell.oskEnabled
324324 }
tests/qmltests/Stage/tst_PhoneStage.qml+3−3
@@ -270,8 +270,8 @@ Item {
270270
271271 function test_select_data() {
272272 return [
273−// { tag: "0", index: 0 },
274−// { tag: "2", index: 2 },
273+ { tag: "0", index: 0 },
274+ { tag: "2", index: 2 },
275275 { tag: "4", index: 4 },
276276 ]
277277 }
@@ -286,7 +286,7 @@ Item {
286286 performEdgeSwipeToShowAppSpread();
287287
288288 print("tapping", selectedAppDeleage.appId, selectedAppDeleage.visible)
289− if (!selectedAppDeleage.x > stage.width - units.gu(5)) {
289+ if (selectedAppDeleage.x > stage.width - units.gu(5)) {
290290 touchFlick(stage, stage.width - units.gu(2), stage.height / 2, units.gu(2), stage.height / 2, true, true, units.gu(2), 10)
291291 }
292292