on xenial help sign in
Fix wrong merge
commitaa291ee37b15039530eecbad6b19b197db5068ba authorAlbert Astals Cid <albert.astals@canonical.com> dateMon 30 Nov 2015, 09:32 (11 years ago) parenta7214d8
1 file changed−31
tests/qmltests/tst_Shell.qml−31
tests/qmltests/tst_Shell.qml−31
@@ -1846,37 +1846,6 @@ Rectangle {
18461846 compare(appDelegate.y >= PanelState.panelHeight, true);
18471847 }
18481848
1849− function test_cantMoveWindowUnderPanel() {
1850− loadDesktopShellWithApps();
1851− var appRepeater = findChild(shell, "appRepeater")
1852− var appDelegate = appRepeater.itemAt(0);
1853−
1854− mousePress(appDelegate, appDelegate.width / 2, units.gu(1))
1855− mouseMove(appDelegate, appDelegate.width / 2, -units.gu(100))
1856−
1857− compare(appDelegate.y >= PanelState.panelHeight, true);
1858− }
1859−
1860− function test_restoreWindowStateFixesIfUnderPanel() {
1861− loadDesktopShellWithApps();
1862− var appRepeater = findChild(shell, "appRepeater")
1863− var appId = ApplicationManager.get(0).appId;
1864− var appDelegate = appRepeater.itemAt(0);
1865−
1866− // Move it under the panel programmatically (might happen later with an alt+drag)
1867− appDelegate.y = -units.gu(10)
1868−
1869− ApplicationManager.stopApplication(appId)
1870− ApplicationManager.startApplication(appId)
1871− waitForRendering(shell)
1872−
1873− // Make sure the newly started one is at index 0 again
1874− tryCompare(ApplicationManager.get(0), "appId", appId);
1875−
1876− appDelegate = appRepeater.itemAt(0);
1877− compare(appDelegate.y >= PanelState.panelHeight, true);
1878− }
1879−
18801849 function test_lifecyclePolicyForNonTouchApp_data() {
18811850 return [
18821851 {tag: "phone", formFactor: "phone", usageScenario: "phone"},