git.iko.soy/unity8
on xenial help sign in
fix hiding after merging a fix from the prereq
f52f718Michael Zanetti
qml/Launcher/Launcher.qml+2−2
compare with xenial
unifiedsplit
@@ -30,7 +30,7 @@ FocusScope {
30 property alias inverted: panel.inverted
30 property alias inverted: panel.inverted
31 property bool shadeBackground: true // can be used to disable background shade when launcher is visible
31 property bool shadeBackground: true // can be used to disable background shade when launcher is visible
32
32
33− property int panelWidth: units.gu(10)
33+ property int panelWidth: units.gu(8)
34 property int dragAreaWidth: units.gu(1)
34 property int dragAreaWidth: units.gu(1)
35 property int minimizeDistance: units.gu(26)
35 property int minimizeDistance: units.gu(26)
36 property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
36 property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
@@ -381,7 +381,7 @@ FocusScope {
381 }
381 }
382
382
383 onKbdNavigationCancelled: {
383 onKbdNavigationCancelled: {
384− root.state = "";
384+ root.hide();
385 root.focus = false;
385 root.focus = false;
386 }
386 }
387
387
tests/mocks/GSettings.1.0/fake_gsettings.cpp+1−1
@@ -23,7 +23,7 @@ GSettingsControllerQml* GSettingsControllerQml::s_controllerInstance = 0;
23GSettingsControllerQml::GSettingsControllerQml()
23GSettingsControllerQml::GSettingsControllerQml()
24 : m_usageMode("Staged")
24 : m_usageMode("Staged")
25 , m_autohideLauncher(false)
25 , m_autohideLauncher(false)
26− , m_launcherWidth(qgetenv("GRID_UNIT_PX").isEmpty() ? 8 : qgetenv("GRID_UNIT_PX").toInt() * 8)
26+ , m_launcherWidth(8)
27{
27{
28}
28}
29
29
tests/qmltests/Launcher/tst_Launcher.qml+14−2
@@ -1201,7 +1201,14 @@ Item {
1201 }
1201 }
1202 }
1202 }
1203
1203
1204+ function test_cancelKbdNavigationWitMouse_data() {
1205+ return [
1206+ {tag: "locked out", autohide: false },
1207+ {tag: "autohide", autohide: true },
1208+ ]
1209+ }
1210+
1204− function test_cancelKbdNavigationWitMouse() {
1211+ function test_cancelKbdNavigationWitMouse(data) {
1205 launcher.openForKeyboardNavigation();
1212 launcher.openForKeyboardNavigation();
1206 waitForRendering(launcher);
1213 waitForRendering(launcher);
1207
1214
@@ -1219,7 +1226,12 @@ Item {
1219
1226
1220 mouseClick(root, root.width / 2, units.gu(2));
1227 mouseClick(root, root.width / 2, units.gu(2));
1221
1228
1229+ if (data.autohide) {
1222− tryCompare(launcher, "state", "");
1230+ tryCompare(launcher, "state", "");
1231+ } else {
1232+ tryCompare(launcher, "state", "visible");
1233+ }
1234+
1223 tryCompare(launcherPanel, "highlightIndex", -2);
1235 tryCompare(launcherPanel, "highlightIndex", -2);
1224 }
1236 }
1225 }
1237 }