on xenial help sign in
DesktopStage - fix focus switch when user taps on window

Also fixes a threading issue in WindowStateStorage where async SQL queries could be run when WindowStateStorage was already destroyed. Fixes: #1431325 Approved by: Michael Zanetti

commit0533cec28a969554f913d2d3206169ed261f257c authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateWed 18 Mar 2015, 10:18 (12 years ago) parentd051ca18d372d5
11 files changed+278−14
plugins/Utils/windowstatestorage.cpp+22−1 plugins/Utils/windowstatestorage.h+4 qml/Stages/DecoratedWindow.qml+5−4 qml/Stages/DesktopStage.qml+15−3 qml/Stages/WindowDecoration.qml+1 qml/Stages/WindowMoveResizeArea.qml+5−3 tests/mocks/Unity/Application/ApplicationManager.h+3−1 tests/qmltests/CMakeLists.txt+1 tests/qmltests/Stages/ApplicationCheckBox.qml+20−1 tests/qmltests/Stages/tst_DesktopStage.qml+201 tests/qmltests/Stages/tst_PhoneStage.qml+1−1
plugins/Utils/windowstatestorage.cpp+22−1
@@ -18,6 +18,7 @@
1818
1919#include <QtConcurrent>
2020#include <QDebug>
21+#include <QFutureSynchronizer>
2122#include <QSqlQuery>
2223#include <QSqlError>
2324#include <QSqlResult>
@@ -36,8 +37,20 @@ WindowStateStorage::WindowStateStorage(QObject *parent):
3637 initdb();
3738}
3839
40+WindowStateStorage::~WindowStateStorage()
41+{
42+ QFutureSynchronizer<void> futureSync;
43+ for (int i = 0; i < m_asyncQueries.count(); ++i) {
44+ futureSync.addFuture(m_asyncQueries[i]);
45+ }
46+ futureSync.waitForFinished();
47+ m_db.close();
48+}
49+
3950void WindowStateStorage::saveGeometry(const QString &windowId, const QRect &rect)
4051{
52+ QMutexLocker mutexLocker(&s_mutex);
53+
4154 QString queryString = QString("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")
4255 .arg(windowId)
4356 .arg(rect.x())
@@ -45,7 +58,15 @@ void WindowStateStorage::saveGeometry(const QString &windowId, const QRect &rect
4558 .arg(rect.width())
4659 .arg(rect.height());
4760
48− QtConcurrent::run(executeAsyncQuery, queryString);
61+ QFuture<void> future = QtConcurrent::run(executeAsyncQuery, queryString);
62+ m_asyncQueries.append(future);
63+
64+ QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();
65+ futureWatcher->setFuture(future);
66+ connect(futureWatcher, &QFutureWatcher<void>::finished,
67+ this,
68+ [=](){ m_asyncQueries.removeAll(futureWatcher->future());
69+ futureWatcher->deleteLater(); });
4970}
5071
5172void WindowStateStorage::executeAsyncQuery(const QString &queryString)
plugins/Utils/windowstatestorage.h+4
@@ -17,12 +17,14 @@
1717#include <QObject>
1818#include <QSqlDatabase>
1919#include <QMutex>
20+#include <QFuture>
2021
2122class WindowStateStorage: public QObject
2223{
2324 Q_OBJECT
2425public:
2526 WindowStateStorage(QObject *parent = 0);
27+ virtual ~WindowStateStorage();
2628
2729 Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect &rect);
2830 Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue);
@@ -35,4 +37,6 @@ private:
3537
3638 // NB: This is accessed from threads. Make sure to mutex it.
3739 QSqlDatabase m_db;
40+
41+ QList< QFuture<void> > m_asyncQueries;
3842};
qml/Stages/DecoratedWindow.qml+5−4
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014-2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -20,13 +20,12 @@ import QtQuick 2.3
2020import Ubuntu.Components 1.1
2121import Unity.Application 0.1
2222
23−Item {
23+FocusScope {
2424 id: root
2525
2626 property alias application: applicationWindow.application
2727 property alias active: decoration.active
2828
29− signal requestFocus();
3029 signal close();
3130 signal maximize();
3231 signal minimize();
@@ -53,8 +52,10 @@ Item {
5352
5453 ApplicationWindow {
5554 id: applicationWindow
55+ objectName: application ? "appWindow_" + application.appId : "appWindow_null"
5656 anchors.fill: parent
5757 anchors.topMargin: units.gu(3)
58− interactive: index == 0
58+ interactive: true
59+ focus: true
5960 }
6061}
qml/Stages/DesktopStage.qml+15−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014-2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -20,14 +20,17 @@ import QtQuick 2.3
2020import Ubuntu.Components 1.1
2121import Unity.Application 0.1
2222import "../Components/PanelState"
23+import Utils 0.1
2324
24−Item {
25+FocusScope {
2526 id: root
2627
2728 anchors.fill: parent
2829
2930 property alias background: wallpaper.source
3031
32+ property var windowStateStorage: WindowStateStorage
33+
3134 CrossFadeImage {
3235 id: wallpaper
3336 anchors.fill: parent
@@ -116,20 +119,29 @@ Item {
116119 ]
117120
118121 WindowMoveResizeArea {
122+ windowStateStorage: root.windowStateStorage
119123 target: appDelegate
120124 minWidth: appDelegate.minWidth
121125 minHeight: appDelegate.minHeight
122126 resizeHandleWidth: units.gu(0.5)
123127 windowId: model.appId // FIXME: Change this to point to windowId once we have such a thing
124128
125− onPressed: ApplicationManager.requestFocusApplication(model.appId)
129+ onPressed: decoratedWindow.focus = true;
126130 }
127131
128132 DecoratedWindow {
133+ id: decoratedWindow
134+ objectName: "decoratedWindow_" + appId
129135 anchors.fill: parent
130136 application: ApplicationManager.get(index)
131137 active: ApplicationManager.focusedApplicationId === model.appId
132138
139+ onFocusChanged: {
140+ if (focus) {
141+ ApplicationManager.requestFocusApplication(model.appId);
142+ }
143+ }
144+
133145 onClose: ApplicationManager.stopApplication(model.appId)
134146 onMaximize: appDelegate.state = (appDelegate.state == "maximized" ? "normal" : "maximized")
135147 onMinimize: appDelegate.state = "minimized"
qml/Stages/WindowDecoration.qml+1
@@ -55,6 +55,7 @@ Item {
5555
5656 Label {
5757 id: titleLabel
58+ objectName: "windowDecorationTitle"
5859 color: "#DFDBD2"
5960 height: parent.height
6061 verticalAlignment: Text.AlignVCenter
qml/Stages/WindowMoveResizeArea.qml+5−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014-2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,8 @@ MouseArea {
2525 anchors.fill: target
2626 anchors.margins: -resizeHandleWidth
2727
28+ property var windowStateStorage: WindowStateStorage
29+
2830 // The target item managed by this. Must be a parent or a sibling
2931 // The area will anchor to it and manage move and resize events
3032 property Item target: null
@@ -48,7 +50,7 @@ MouseArea {
4850 }
4951
5052 Component.onCompleted: {
51− var windowState = WindowStateStorage.getGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))
53+ var windowState = windowStateStorage.getGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))
5254 if (windowState !== undefined) {
5355 target.x = windowState.x
5456 target.y = windowState.y
@@ -102,6 +104,6 @@ MouseArea {
102104 }
103105
104106 Component.onDestruction: {
105− WindowStateStorage.saveGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))
107+ windowStateStorage.saveGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))
106108 }
107109}
tests/mocks/Unity/Application/ApplicationManager.h+3−1
@@ -34,6 +34,7 @@ class ApplicationManager : public ApplicationManagerInterface {
3434 Q_FLAGS(ExecFlags)
3535
3636 Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged)
37+ Q_PROPERTY(QStringList availableApplications READ availableApplications NOTIFY availableApplicationsChanged)
3738
3839 public:
3940 ApplicationManager(QObject *parent = nullptr);
@@ -75,7 +76,7 @@ class ApplicationManager : public ApplicationManagerInterface {
7576 void setForceDashActive(bool forceDashActive) override;
7677
7778 // Only for testing
78− Q_INVOKABLE QStringList availableApplications();
79+ QStringList availableApplications();
7980 Q_INVOKABLE ApplicationInfo* add(QString appId);
8081
8182 QModelIndex findIndex(ApplicationInfo* application);
@@ -85,6 +86,7 @@ class ApplicationManager : public ApplicationManagerInterface {
8586 Q_SIGNALS:
8687 void focusRequested(const QString &appId);
8788 void emptyChanged(bool empty);
89+ void availableApplicationsChanged(QStringList list);
8890
8991 private Q_SLOTS:
9092 void onWindowCreatedTimerTimeout();
tests/qmltests/CMakeLists.txt+1
@@ -83,6 +83,7 @@ add_qml_test(Panel/Indicators IndicatorsLight ENVIRONMENT "LD_LIBRARY_PATH=${CMA
8383add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
8484add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
8585add_qml_test(Stages ApplicationWindow)
86+add_qml_test(Stages DesktopStage)
8687add_qml_test(Stages PhoneStage ENVIRONMENT)
8788add_qml_test(Stages SpreadDelegate ENVIRONMENT)
8889add_qml_test(Stages SurfaceContainer ENVIRONMENT)
tests/qmltests/Stages/ApplicationCheckBox.qml+20−1
@@ -24,15 +24,23 @@ RowLayout {
2424 property string appId
2525 property alias checked: checkbox.checked
2626
27+ enabled: appId !== "unity8-dash"
28+
2729 Layout.fillWidth: true
2830 CheckBox {
2931 id: checkbox
3032 checked: false
3133 activeFocusOnPress: false
34+ property bool noop: false
3235 onCheckedChanged: {
36+ if (noop) {
37+ return;
38+ }
3339 if (checked) {
34− ApplicationManager.startApplication(root.appId);
40+ var application = ApplicationManager.startApplication(root.appId);
41+ appConnections.target = application;
3542 } else {
43+ appConnections.target = null;
3644 ApplicationManager.stopApplication(root.appId);
3745 }
3846 }
@@ -42,4 +50,15 @@ RowLayout {
4250 color: "white"
4351 anchors.verticalCenter: parent.verticalCenter
4452 }
53+
54+ Connections {
55+ id: appConnections
56+ onStateChanged: {
57+ if (target.state == ApplicationInfoInterface.Stopped) {
58+ checkbox.noop = true;
59+ checkbox.checked = false;
60+ checkbox.noop = false;
61+ }
62+ }
63+ }
4564}
tests/qmltests/Stages/tst_DesktopStage.qmlnew file+201
@@ -0,0 +1,201 @@
1+/*
2+ * Copyright (C) 2015 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.0
18+import QtTest 1.0
19+import Ubuntu.Components 1.1
20+import Ubuntu.Components.ListItems 1.0 as ListItem
21+import Unity.Application 0.1
22+import Unity.Test 0.1
23+
24+import "../../../qml/Stages"
25+
26+Rectangle {
27+ id: root
28+ color: "darkblue"
29+ width: desktopStageLoader.width + controls.width
30+ height: desktopStageLoader.height
31+
32+ QtObject {
33+ id: fakeWindowStateStorage
34+
35+ property var storedGeom: [
36+ ["unity8-dash", Qt.rect(units.gu(2), units.gu(2), units.gu(50), units.gu(50))],
37+ ["webbrowser-app", Qt.rect(units.gu(60), units.gu(2), units.gu(50), units.gu(50))]
38+ ]
39+
40+ function saveGeometry(windowId, geometry) {
41+ for (var i = 0; i < storedGeom.length; ++i) {
42+ if (storedGeom[i][0] === windowId) {
43+ storedGeom[i][1] = geometry;
44+ return;
45+ }
46+ }
47+ // if new
48+ storedGeom[storedGeom.length] = [windowId, geometry];
49+ }
50+ function getGeometry(windowId, defaultGeometry) {
51+ for (var i = 0; i < storedGeom.length; ++i) {
52+ if (storedGeom[i][0] === windowId) {
53+ return storedGeom[i][1];
54+ }
55+ }
56+ return defaultGeometry;
57+ }
58+ }
59+
60+ Loader {
61+ id: desktopStageLoader
62+ x: ((root.width - controls.width) - width) / 2
63+ y: (root.height - height) / 2
64+ width: units.gu(160*0.9)
65+ height: units.gu(100*0.9)
66+
67+ focus: true
68+
69+ property bool itemDestroyed: false
70+ sourceComponent: Component {
71+ DesktopStage {
72+ anchors.fill: parent
73+ windowStateStorage: fakeWindowStateStorage
74+ Component.onDestruction: {
75+ desktopStageLoader.itemDestroyed = true;
76+ }
77+ focus: true
78+ }
79+ }
80+ }
81+
82+ Rectangle {
83+ id: controls
84+ color: "darkgrey"
85+ width: units.gu(30)
86+ anchors {
87+ top: parent.top
88+ bottom: parent.bottom
89+ right: parent.right
90+ }
91+
92+ Column {
93+ anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
94+ spacing: units.gu(1)
95+ Repeater {
96+ model: ApplicationManager.availableApplications
97+ ApplicationCheckBox {
98+ appId: modelData
99+ }
100+ }
101+ }
102+ }
103+
104+ UnityTestCase {
105+ id: testCase
106+ name: "DesktopStage"
107+ when: windowShown
108+
109+ property Item desktopStage: desktopStageLoader.status === Loader.Ready ? desktopStageLoader.item : null
110+
111+ function init() {
112+ }
113+
114+ function cleanup() {
115+ desktopStageLoader.itemDestroyed = false;
116+ desktopStageLoader.active = false;
117+
118+ tryCompare(desktopStageLoader, "status", Loader.Null);
119+ tryCompare(desktopStageLoader, "item", null);
120+ // Loader.status might be Loader.Null and Loader.item might be null but the Loader
121+ // actually took place. Likely because Loader waits until the next event loop
122+ // iteration to do its work. So to ensure the reload, we will wait until the
123+ // Shell instance gets destroyed.
124+ tryCompare(desktopStageLoader, "itemDestroyed", true);
125+
126+ killAllRunningApps();
127+
128+ desktopStageLoader.active = true;
129+ tryCompare(desktopStageLoader, "status", Loader.Ready);
130+ }
131+
132+ function killAllRunningApps() {
133+ while (ApplicationManager.count > 1) {
134+ var appIndex = ApplicationManager.get(0).appId == "unity8-dash" ? 1 : 0
135+ ApplicationManager.stopApplication(ApplicationManager.get(appIndex).appId);
136+ }
137+ compare(ApplicationManager.count, 1)
138+ }
139+
140+ function waitUntilAppSurfaceShowsUp(appId) {
141+ var appWindow = findChild(desktopStage, "appWindow_" + appId);
142+ verify(appWindow);
143+ var appWindowStates = findInvisibleChild(appWindow, "applicationWindowStateGroup");
144+ verify(appWindowStates);
145+ tryCompare(appWindowStates, "state", "surface");
146+ }
147+
148+ function rectsIntersect(aLocal, bLocal) {
149+
150+ var a = aLocal.mapToItem(null, 0, 0, aLocal.width, aLocal.height);
151+ var b = bLocal.mapToItem(null, 0, 0, bLocal.width, bLocal.height);
152+
153+ return !((a.y+a.height) < b.y
154+ || a.y > (b.y+b.height)
155+ || (a.x+a.width) < b.x
156+ || a.x > (b.x+b.width));
157+ }
158+
159+ function test_tappingOnWindowChangesFocusedApp() {
160+ ApplicationManager.startApplication("webbrowser-app");
161+ waitUntilAppSurfaceShowsUp("webbrowser-app");
162+
163+ var webbrowserWindow = findChild(desktopStage, "appWindow_webbrowser-app");
164+ verify(webbrowserWindow);
165+ var dashWindow = findChild(desktopStage, "appWindow_unity8-dash");
166+ verify(dashWindow);
167+
168+ // some sanity check
169+ compare(rectsIntersect(dashWindow, webbrowserWindow), false);
170+
171+ tap(dashWindow);
172+ compare(dashWindow.application.session.surface.activeFocus, true);
173+
174+ tap(webbrowserWindow);
175+ compare(webbrowserWindow.application.session.surface.activeFocus, true);
176+ }
177+
178+ function test_tappingOnWindowTitleChangesFocusedApp() {
179+ ApplicationManager.startApplication("webbrowser-app");
180+ waitUntilAppSurfaceShowsUp("webbrowser-app");
181+
182+ var webbrowserWindow = findChild(desktopStage, "decoratedWindow_webbrowser-app");
183+ verify(webbrowserWindow);
184+ var webbrowserWindowTitle = findChild(webbrowserWindow, "windowDecorationTitle");
185+ verify(webbrowserWindowTitle);
186+ var dashWindow = findChild(desktopStage, "decoratedWindow_unity8-dash");
187+ verify(dashWindow);
188+ var dashWindowTitle = findChild(dashWindow, "windowDecorationTitle");
189+ verify(dashWindowTitle);
190+
191+ // some sanity check
192+ compare(rectsIntersect(dashWindow, webbrowserWindow), false);
193+
194+ tap(dashWindowTitle);
195+ compare(dashWindow.application.session.surface.activeFocus, true);
196+
197+ tap(webbrowserWindowTitle);
198+ compare(webbrowserWindow.application.session.surface.activeFocus, true);
199+ }
200+ }
201+}
tests/qmltests/Stages/tst_PhoneStage.qml+1−1
@@ -116,7 +116,7 @@ Item {
116116 function addApps(count) {
117117 if (count == undefined) count = 1;
118118 for (var i = 0; i < count; i++) {
119− var app = ApplicationManager.startApplication(ApplicationManager.availableApplications()[ApplicationManager.count])
119+ var app = ApplicationManager.startApplication(ApplicationManager.availableApplications[ApplicationManager.count])
120120 tryCompare(app, "state", ApplicationInfoInterface.Running)
121121 var spreadView = findChild(phoneStage, "spreadView");
122122 tryCompare(spreadView, "contentX", -spreadView.shift);