on xenial help sign in
hode the launcher on fullscreen apps, add a test for it
commit4fbcdb2ae3dd6bb84be3784c3ee9aa2fde45da04 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 14 Jan 2016, 21:33 (11 years ago) parent3cf7a86
2 files changed+21−1
qml/Shell.qml+1−1 tests/qmltests/tst_Shell.qml+20
qml/Shell.qml+1−1
@@ -568,7 +568,7 @@ Item {
568568 superPressed: physicalKeysMapper.superPressed
569569 superTabPressed: physicalKeysMapper.superTabPressed
570570 panelWidth: units.gu(settings.launcherWidth)
571− lockedVisible: shell.usageScenario == "desktop" && !settings.autohideLauncher
571+ lockedVisible: shell.usageScenario == "desktop" && !settings.autohideLauncher && !panel.fullscreenMode
572572
573573 onShowDashHome: showHome()
574574 onDash: showDash()
tests/qmltests/tst_Shell.qml+20
@@ -2105,5 +2105,25 @@ Rectangle {
21052105
21062106 compare(shownSize + launcher.panelWidth, hiddenSize);
21072107 }
2108+
2109+ function test_fullscreenAppHidesLockedOutLauncher() {
2110+ loadShell("desktop");
2111+ shell.usageScenario = "desktop";
2112+ waitForRendering(shell);
2113+
2114+ var appContainer = findChild(shell, "appContainer");
2115+ var launcher = findChild(shell, "launcher");
2116+ var launcherPanel = findChild(launcher, "launcherPanel");
2117+
2118+ GSettingsController.setAutohideLauncher(false);
2119+ waitForRendering(shell)
2120+
2121+ tryCompare(appContainer, "width", shell.width - launcherPanel.width);
2122+
2123+ var cameraApp = ApplicationManager.startApplication("camera-app");
2124+ waitUntilAppWindowIsFullyLoaded(cameraApp);
2125+
2126+ tryCompare(appContainer, "width", shell.width);
2127+ }
21082128 }
21092129}