git.iko.soy/unity8
on xenial help sign in
Shell dialog improvements (kbd focus, mouse eater)

Approved by: Michael Zanetti, Unity8 CI Bot

commit3f99e4c1cbab82abb0faf630eab5cd54f857db26 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 24 Jan 2017, 07:38 (10 years ago) parentac6799e1a53504
8 files changed+66−11
compare with xenial
unifiedsplit
plugins/Utils/tabfocusfence.cpp+26 plugins/Utils/tabfocusfence.h+3 qml/Components/Dialogs.qml+14−2 qml/Components/ShellDialog.qml+6−2 qml/OrientedShell.qml+2−1 qml/Shell.qml+3 tests/qmltests/tst_OrientedShell.qml+12−5 tests/qmltests/tst_Shell.qml−1
plugins/Utils/tabfocusfence.cpp+26
@@ -25,6 +25,32 @@ TabFocusFenceItem::TabFocusFenceItem(QQuickItem *parent) : QQuickItem(parent)
2525 setFlag(ItemIsFocusScope);
2626}
2727
28+bool TabFocusFenceItem::focusNext()
29+{
30+ QQuickItem * current = scopedFocusItem();
31+ if (current) {
32+ QQuickItem * next = current->nextItemInFocusChain(true);
33+ if (next) {
34+ next->setFocus(true, Qt::TabFocusReason);
35+ return true;
36+ }
37+ }
38+ return false;
39+}
40+
41+bool TabFocusFenceItem::focusPrev()
42+{
43+ QQuickItem * current = scopedFocusItem();
44+ if (current) {
45+ QQuickItem * prev = current->nextItemInFocusChain(false);
46+ if (prev) {
47+ prev->setFocus(true, Qt::BacktabFocusReason);
48+ return true;
49+ }
50+ }
51+ return false;
52+}
53+
2854void TabFocusFenceItem::keyPressEvent(QKeyEvent *event)
2955{
3056 // Needed so we eat Tab keys when there's only one item inside the fence
plugins/Utils/tabfocusfence.h+3
@@ -28,6 +28,9 @@ Q_OBJECT
2828public:
2929 TabFocusFenceItem(QQuickItem *parent = nullptr);
3030
31+ Q_INVOKABLE bool focusNext();
32+ Q_INVOKABLE bool focusPrev();
33+
3134 void keyPressEvent(QKeyEvent *event) override;
3235 void keyReleaseEvent(QKeyEvent *event) override;
3336};
qml/Components/Dialogs.qml+14−2
@@ -24,10 +24,13 @@ import Unity.Platform 1.0
2424import Utils 0.1
2525import "../Greeter"
2626
27−Item {
27+MouseArea {
2828 id: root
29+ acceptedButtons: Qt.AllButtons
30+ hoverEnabled: true
31+ onWheel: wheel.accepted = true
2932
30− readonly property alias hasActiveDialog: dialogLoader.active
33+ readonly property bool hasActiveDialog: dialogLoader.active || d.modeSwitchWarningPopup
3134
3235 // to be set from outside, useful mostly for testing purposes
3336 property var unitySessionService: DBusUnitySessionService
@@ -42,6 +45,7 @@ Item {
4245 }
4346 property string usageScenario
4447 property size screenSize: Qt.size(Screen.width, Screen.height)
48+ property bool hasKeyboard: false
4549
4650 signal powerOffClicked();
4751
@@ -120,6 +124,11 @@ Item {
120124 onTriggered: LightDMService.greeter.showGreeter()
121125 }
122126
127+ GlobalShortcut { // lock screen
128+ shortcut: Qt.MetaModifier|Qt.Key_L
129+ onTriggered: LightDMService.greeter.showGreeter()
130+ }
131+
123132 QtObject {
124133 id: d // private stuff
125134 objectName: "dialogsPrivate"
@@ -155,6 +164,7 @@ Item {
155164 LightDMService.greeter.showGreeter()
156165 logoutDialog.hide();
157166 }
167+ Component.onCompleted: if (root.hasKeyboard) forceActiveFocus(Qt.TabFocusReason)
158168 }
159169 Button {
160170 width: parent.width
@@ -198,6 +208,7 @@ Item {
198208 rebootDialog.hide();
199209 }
200210 color: theme.palette.normal.negative
211+ Component.onCompleted: if (root.hasKeyboard) forceActiveFocus(Qt.TabFocusReason)
201212 }
202213 }
203214 }
@@ -218,6 +229,7 @@ Item {
218229 root.powerOffClicked();
219230 }
220231 color: theme.palette.normal.negative
232+ Component.onCompleted: if (root.hasKeyboard) forceActiveFocus(Qt.TabFocusReason)
221233 }
222234 Button {
223235 width: parent.width
qml/Components/ShellDialog.qml+6−2
@@ -37,8 +37,6 @@ Dialog {
3737
3838 onVisibleChanged: { if (!visible && dialogLoader) { dialogLoader.active = false; } }
3939
40− Keys.onEscapePressed: hide()
41−
4240 focus: true
4341
4442 // FIXME: this is a hack because Dialog subtheming seems broken atm
@@ -63,5 +61,11 @@ Dialog {
6361 width: parent.width
6462 spacing: units.gu(2)
6563 }
64+ Keys.onDownPressed: {
65+ event.accepted = focusNext();
66+ }
67+ Keys.onUpPressed: {
68+ event.accepted = focusPrev();
69+ }
6670 }
6771}
qml/OrientedShell.qml+2−1
@@ -266,7 +266,8 @@ Item {
266266 nativeWidth: root.width
267267 nativeHeight: root.height
268268 mode: applicationArguments.mode
269− hasMouse: miceModel.count + touchPadModel.count > 0
269+ hasMouse: pointerInputDevices > 0
270+ hasKeyboard: keyboardsModel.count > 0
270271 // TODO: Factor in if the current screen is a touch screen and if the user wants to
271272 // have multiple keyboards around. For now we only enable one keyboard at a time
272273 // thus hiding it here if there is a physical one around or if we have a second
qml/Shell.qml+3
@@ -68,6 +68,7 @@ StyledItem {
6868 stage.updateFocusedAppOrientationAnimated();
6969 }
7070 property bool hasMouse: false
71+ property bool hasKeyboard: false
7172
7273 // to be read from outside
7374 readonly property int mainAppWindowOrientationAngle: stage.mainAppWindowOrientationAngle
@@ -657,8 +658,10 @@ StyledItem {
657658 id: dialogs
658659 objectName: "dialogs"
659660 anchors.fill: parent
661+ visible: hasActiveDialog
660662 z: overlay.z + 10
661663 usageScenario: shell.usageScenario
664+ hasKeyboard: shell.hasKeyboard
662665 onPowerOffClicked: {
663666 shutdownFadeOutRectangle.enabled = true;
664667 shutdownFadeOutRectangle.visible = true;
tests/qmltests/tst_OrientedShell.qml+12−5
@@ -1559,7 +1559,14 @@ Rectangle {
15591559 return surface.activeFocus;
15601560 }
15611561
1562− function test_tabCyclyingInShutdownDialog() {
1562+ function test_tabCyclyingInShutdownDialog_data() {
1563+ return [
1564+ {tag: "TAB", key: Qt.Key_Tab},
1565+ {tag: "DOWN", key: Qt.Key_Down}
1566+ ];
1567+ }
1568+
1569+ function test_tabCyclyingInShutdownDialog(data) {
15631570 loadShell("mako");
15641571
15651572 testCase.showPowerDialog();
@@ -1569,13 +1576,13 @@ Rectangle {
15691576
15701577 tryCompare(buttons[0], "activeFocus", true);
15711578
1572− keyClick(Qt.Key_Tab);
1579+ keyClick(data.key);
15731580 tryCompare(buttons[1], "activeFocus", true);
15741581
1575− keyClick(Qt.Key_Tab);
1582+ keyClick(data.key);
15761583 tryCompare(buttons[2], "activeFocus", true);
15771584
1578− keyClick(Qt.Key_Tab);
1585+ keyClick(data.key);
15791586 tryCompare(buttons[0], "activeFocus", true);
15801587
15811588 keyClick(Qt.Key_Escape);
@@ -1584,7 +1591,7 @@ Rectangle {
15841591 tryCompare(dialogLoader, "item", null);
15851592 }
15861593
1587− function test_escColosesShutdownDialog() {
1594+ function test_escClosesShutdownDialog() {
15881595 loadShell("mako");
15891596
15901597 testCase.showPowerDialog();
tests/qmltests/tst_Shell.qml−1
@@ -568,7 +568,6 @@ Rectangle {
568568 // is loaded by default
569569 tearDown();
570570 }
571−
572571 }
573572
574573 function cleanup() {