git.iko.soy/unity8
on xenial help sign in
also exclude Super+W
commitcd0bf0614cf3b19a2de1523d807cad4ce987af60 authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 14 Nov 2016, 13:05 (10 years ago) parent9d6aef4
2 files changed+10
compare with xenial
unifiedsplit
qml/Stage/Stage.qml+1 tests/qmltests/tst_Shell.qml+9
qml/Stage/Stage.qml+1
@@ -172,6 +172,7 @@ FocusScope {
172172 GlobalShortcut {
173173 id: showSpreadShortcut
174174 shortcut: Qt.MetaModifier|Qt.Key_W
175+ active: root.spreadEnabled
175176 onTriggered: priv.goneToSpread = true
176177 }
177178
tests/qmltests/tst_Shell.qml+9
@@ -2815,6 +2815,15 @@ Rectangle {
28152815 keyClick(Qt.Key_Tab);
28162816 tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
28172817 keyRelease(Qt.Key_Alt);
2818+
2819+ stage.closeSpread();
2820+ tryCompare(stage, "state", "staged");
2821+
2822+ // Try by Super+W
2823+ keyPress(Qt.Key_W, Qt.MetaModifier)
2824+ tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2825+ keyRelease(Qt.Key_W, Qt.MetaModifier)
2826+
28182827 }
28192828 }
28202829}