git.iko.soy/unity8
on xenial help sign in
Initial support for child windows (menus, dialogs, tooltips)
f2ff1f0Daniel d'Andrada
CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -70,7 +70,7 @@ find_package(Qt5DBus 5.6 REQUIRED)
70find_package(Qt5Concurrent 5.6 REQUIRED)
70find_package(Qt5Concurrent 5.6 REQUIRED)
71find_package(Qt5Sql 5.6 REQUIRED)
71find_package(Qt5Sql 5.6 REQUIRED)
72
72
73−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=25)
73+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=26)
74pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
74pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
75pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
75pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
76pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
76pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
debian/control+3−3
@@ -38,7 +38,7 @@ Build-Depends: cmake,
38 libubuntugestures5-private-dev (>= 1.3.2030),
38 libubuntugestures5-private-dev (>= 1.3.2030),
39 libudev-dev,
39 libudev-dev,
40 libudm-common-dev,
40 libudm-common-dev,
41− libunity-api-dev (>= 8.1),
41+ libunity-api-dev (>= 8.2),
42 libusermetricsoutput1-dev,
42 libusermetricsoutput1-dev,
43# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
43# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
44 libx11-dev[!arm64 !armhf],
44 libx11-dev[!arm64 !armhf],
@@ -163,7 +163,7 @@ Depends: qml-module-qtquick-layouts,
163 qttranslations5-l10n,
163 qttranslations5-l10n,
164 ubuntu-thumbnailer-impl-0,
164 ubuntu-thumbnailer-impl-0,
165 ubuntu-wallpapers,
165 ubuntu-wallpapers,
166− unity-application-impl-23,
166+ unity-application-impl-26,
167 unity-notifications-impl-3,
167 unity-notifications-impl-3,
168 unity-plugin-scopes | unity-scopes-impl,
168 unity-plugin-scopes | unity-scopes-impl,
169 unity-scopes-impl-12,
169 unity-scopes-impl-12,
@@ -214,7 +214,7 @@ Depends: dbus-test-runner,
214 ${misc:Depends},
214 ${misc:Depends},
215 ${shlibs:Depends},
215 ${shlibs:Depends},
216Provides: unity-application-impl,
216Provides: unity-application-impl,
217− unity-application-impl-23,
217+ unity-application-impl-26,
218 unity8-fake-env,
218 unity8-fake-env,
219Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1),
219Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1),
220 unity8-fake-env,
220 unity8-fake-env,
plugins/WindowManager/TopLevelWindowModel.cpp+36−28
@@ -176,18 +176,13 @@ void TopLevelWindowModel::prependSurfaceHelper(unityapi::MirSurfaceInterface *su
176 // No point in signaling anything if we're resetting the whole model
176 // No point in signaling anything if we're resetting the whole model
177 }
177 }
178
178
179− int id = generateId();
180− Window *window = new Window(id, this);
179+ Window *window = createWindow(surface);
181− if (surface) {
180+
182− window->setSurface(surface);
183− }
184 m_windowModel.prepend(ModelEntry(window, application));
181 m_windowModel.prepend(ModelEntry(window, application));
185 if (surface) {
182 if (surface) {
186 connectSurface(surface);
183 connectSurface(surface);
187 }
184 }
188
185
189− connectWindow(window);
190−
191 if (m_modelState == InsertingState) {
186 if (m_modelState == InsertingState) {
192 endInsertRows();
187 endInsertRows();
193 Q_EMIT countChanged();
188 Q_EMIT countChanged();
@@ -322,34 +317,47 @@ void TopLevelWindowModel::onSurfaceDestroyed(unityapi::MirSurfaceInterface *surf
322 }
317 }
323}
318}
324
319
320+Window *TopLevelWindowModel::createWindow(unityapi::MirSurfaceInterface *surface)
321+{
322+ int id = generateId();
323+ Window *qmlWindow = new Window(id, this);
324+ connectWindow(qmlWindow);
325+ if (surface) {
326+ qmlWindow->setSurface(surface);
327+ }
328+ return qmlWindow;
329+}
330+
325void TopLevelWindowModel::onSurfaceCreated(unityapi::MirSurfaceInterface *surface)
331void TopLevelWindowModel::onSurfaceCreated(unityapi::MirSurfaceInterface *surface)
326{
332{
327 DEBUG_MSG << "(" << surface << ")";
333 DEBUG_MSG << "(" << surface << ")";
328− if (surface->type() == Mir::InputMethodType) {
334+
329− int id = generateId();
335+ if (surface->parentSurface()) {
330− Window *qmlWindow = new Window(id, this);
336+ // Wrap it in a Window so that we keep focusedWindow() up to date.
331− connectWindow(qmlWindow);
337+ Window *window = createWindow(surface);
338+ connect(surface, &QObject::destroyed, window, [=](){
332− qmlWindow->setSurface(surface);
339+ window->setSurface(nullptr);
333− setInputMethodWindow(qmlWindow);
340+ window->deleteLater();
341+ });
334 } else {
342 } else {
335− auto application = m_applicationManager->findApplicationWithSurface(surface);
343+ if (surface->type() == Mir::InputMethodType) {
336− if (application) {
344+ setInputMethodWindow(createWindow(surface));
337− prependSurface(surface, application);
338 } else {
345 } else {
346+ auto *application = m_applicationManager->findApplicationWithSurface(surface);
347+ if (application) {
348+ prependSurface(surface, application);
349+ } else {
339− // Must be a prompt session. No need to do add it as a prompt surface is not top-level.
350+ // Must be a prompt session. No need to do add it as a prompt surface is not top-level.
340− // It will show up in the ApplicationInfoInterface::promptSurfaceList of some application.
351+ // It will show up in the ApplicationInfoInterface::promptSurfaceList of some application.
341− // Still wrap it in a Window though, so that we keep focusedWindow() up to date.
352+ // Still wrap it in a Window though, so that we keep focusedWindow() up to date.
342− int id = generateId();
343− Window *promptWindow = new Window(id, this);
353+ Window *promptWindow = createWindow(surface);
344− connectWindow(promptWindow);
345− promptWindow->setSurface(surface);
346− connect(surface, &QObject::destroyed, promptWindow, [=](){
354+ connect(surface, &QObject::destroyed, promptWindow, [=](){
347− promptWindow->setSurface(nullptr);
355+ promptWindow->setSurface(nullptr);
348− promptWindow->deleteLater();
356+ promptWindow->deleteLater();
349− });
357+ });
358+ }
350 }
359 }
351 }
360 }
352− // TODO: handle surfaces that are neither top-level windows nor input method. eg: child dialogs, popups, menus
353}
361}
354
362
355void TopLevelWindowModel::removeAt(int index)
363void TopLevelWindowModel::removeAt(int index)
plugins/WindowManager/TopLevelWindowModel.h+2
@@ -220,6 +220,8 @@ private:
220
220
221 void activateTopMostWindowWithoutId(int forbiddenId);
221 void activateTopMostWindowWithoutId(int forbiddenId);
222
222
223+ Window *createWindow(unity::shell::application::MirSurfaceInterface *surface);
224+
223 struct ModelEntry {
225 struct ModelEntry {
224 ModelEntry() {}
226 ModelEntry() {}
225 ModelEntry(Window *window,
227 ModelEntry(Window *window,
plugins/WindowManager/Window.h−1
@@ -32,7 +32,6 @@ namespace unity {
32 }
32 }
33}
33}
34
34
35−
36Q_DECLARE_LOGGING_CATEGORY(UNITY_WINDOW)
35Q_DECLARE_LOGGING_CATEGORY(UNITY_WINDOW)
37
36
38/**
37/**
qml/Components/WindowControlButtons.qml+2
@@ -29,6 +29,7 @@ Row {
29 property bool windowIsMaximized: false
29 property bool windowIsMaximized: false
30 property bool closeButtonShown: true
30 property bool closeButtonShown: true
31 property bool maximizeButtonShown: true
31 property bool maximizeButtonShown: true
32+ property bool minimizeButtonVisible: true
32 property bool overlayShown
33 property bool overlayShown
33
34
34 signal closeClicked()
35 signal closeClicked()
@@ -75,6 +76,7 @@ Row {
75 height: parent.height
76 height: parent.height
76 width: height
77 width: height
77 onClicked: root.minimizeClicked()
78 onClicked: root.minimizeClicked()
79+ visible: root.minimizeButtonVisible
78
80
79 // We dont want touch events to fall through to parent,
81 // We dont want touch events to fall through to parent,
80 // otherwise the containsMouse will not work.
82 // otherwise the containsMouse will not work.
qml/Stage/ChildWindow.qmlnew file+159
@@ -0,0 +1,159 @@
1+/*
2+ * Copyright (C) 2016 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.4
18+import Ubuntu.Components 1.3
19+import Unity.Application 0.1
20+
21+Item {
22+ id: root
23+
24+ // Set from outside.
25+ property var surface
26+ property Item boundsItem
27+ property Item target
28+ property alias requestedWidth: surfaceContainer.requestedWidth
29+ property alias requestedHeight: surfaceContainer.requestedHeight
30+
31+ width: surface ? surface.size.width : 0
32+ height: surface ? surface.size.height : 0
33+
34+ // Make it get shown and hidden with a fade in/out effect
35+ opacity: surface && surface.state !== Mir.MinimizedState && surface.state !== Mir.HiddenState ? 1.0 : 0.0
36+ Behavior on opacity { UbuntuNumberAnimation {} }
37+ visible: opacity !== 0.0 // make it transparent to input as well
38+
39+ readonly property bool dragging: windowResizeArea.dragging || d.touchOverlayDragging || d.moveHandlerDragging
40+
41+ QtObject {
42+ id: d
43+ readonly property bool decorated: surface ? surface.type === Mir.UtilityType
44+ || surface.type === Mir.DialogType
45+ || surface.type === Mir.NormalType
46+ : false
47+
48+ readonly property bool moveable: decorated
49+ readonly property bool resizeable: decorated
50+
51+ property alias decoration: decorationLoader.item
52+ property alias moveHandler: moveHandlerLoader.item
53+
54+ readonly property bool touchOverlayDragging: touchOverlayLoader.item ? touchOverlayLoader.item.dragging : false
55+ readonly property bool moveHandlerDragging: moveHandlerLoader.item ? moveHandlerLoader.item.dragging : false
56+ }
57+
58+ WindowResizeArea {
59+ id: windowResizeArea
60+ anchors {
61+ top: decorationLoader.top
62+ bottom: parent.bottom
63+ left: parent.left; right: parent.right
64+ }
65+ target: root.target
66+ boundsItem: root.boundsItem
67+ minWidth: units.gu(10)
68+ minHeight: units.gu(10)
69+ borderThickness: units.gu(2)
70+ enabled: d.resizeable
71+ visible: enabled
72+ onPressed: root.surface.activate();
73+ }
74+
75+ BorderImage {
76+ property real shadowThickness: root.surface && root.surface.focused ? units.gu(2) : units.gu(1.5)
77+ anchors {
78+ top: decorationLoader.top
79+ bottom: parent.bottom
80+ left: parent.left; right: parent.right
81+ margins: -shadowThickness
82+ }
83+ source: "../graphics/dropshadow2gu.sci"
84+ opacity: .3
85+ }
86+
87+ Loader {
88+ id: decorationLoader
89+ anchors.bottom: root.top
90+ anchors.left: root.left
91+ anchors.right: root.right
92+
93+ visible: active
94+ active: d.decorated
95+
96+ height: item ? item.height : 0
97+
98+ sourceComponent: Component {
99+ WindowDecoration {
100+ height: units.gu(3)
101+ title: root.surface ? root.surface.name : ""
102+ active: root.surface ? root.surface.focused : false
103+ closeButtonVisible: false
104+ minimizeButtonVisible: false
105+ maximizeButtonShown: false
106+ onPressed: root.surface.activate();
107+ onPressedChanged: if (d.moveHandler) { d.moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY); }
108+ onPositionChanged: if (d.moveHandler) {
109+ d.moveHandler.handlePositionChanged(mouse);
110+ }
111+ onReleased: if (d.moveHandler) { d.moveHandler.handleReleased(); }
112+ }
113+ }
114+ }
115+
116+ Loader {
117+ id: moveHandlerLoader
118+ active: d.moveable
119+ sourceComponent: Component {
120+ MoveHandler {
121+ target: root.target
122+ buttonsWidth: d.decoration ? d.decoration.buttonsWidth : 0
123+ boundsItem: root.boundsItem
124+ boundsTopMargin: decorationLoader.height
125+ }
126+ }
127+ }
128+
129+ SurfaceContainer {
130+ id: surfaceContainer
131+
132+ // Do not hold on to a dead surface so that it can be destroyed.
133+ // FIXME It should not be QML's job to release the MirSurface if its backing surface goes away. Instead backing
134+ // MirSurface should go away but the MirSurfaceItem should be able to live on with the last drawn frame
135+ // and properties.
136+ surface: root.surface && root.surface.live ? root.surface : null
137+
138+ requestedWidth: surface ? surface.size.width : 0
139+ requestedHeight: surface ? surface.size.height : 0
140+
141+ // TODO ChildWindow parent will probably want to control those
142+ interactive: true
143+ consumesInput: true
144+ }
145+
146+ Loader {
147+ id: touchOverlayLoader
148+ active: d.resizeable || d.moveable
149+ anchors.top: decorationLoader.top
150+ anchors.bottom: parent.bottom
151+ anchors.left: parent.left
152+ anchors.right: parent.right
153+ sourceComponent: Component { WindowControlsOverlay {
154+ target: root.target
155+ resizeArea: windowResizeArea
156+ boundsItem: root.boundsItem
157+ } }
158+ }
159+}
qml/Stage/ChildWindowRepeater.qmlnew file+28
@@ -0,0 +1,28 @@
1+/*
2+ * Copyright (C) 2016 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.4
18+
19+// Meant to be created with a Loader to circumvent the "ChildWindowTree is instantiated recursively" error from the QML engine
20+Repeater {
21+ id: root
22+ property Item boundsItem
23+ delegate: ChildWindowTree {
24+ surface: model.surface
25+ z: root.count - model.index
26+ boundsItem: root.boundsItem
27+ }
28+}
qml/Stage/ChildWindowTree.qmlnew file+127
@@ -0,0 +1,127 @@
1+/*
2+ * Copyright (C) 2016 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.4
18+import Ubuntu.Components 1.3
19+import Unity.Application 0.1
20+
21+Item {
22+ id: root
23+
24+ property alias surface: childWindow.surface
25+ property real displacementX: 0
26+ property real displacementY: 0
27+ property alias boundsItem: childWindow.boundsItem
28+
29+ x: surface ? surface.position.x + displacementX : 0
30+ y: surface ? surface.position.y + displacementY : 0
31+ width: childWindow.width
32+ height: childWindow.height
33+
34+ ////
35+ // API expected by MoveHandler (and some by WindowResizeArea as well)
36+ readonly property bool maximized: false
37+ readonly property bool maximizedLeft: false
38+ readonly property bool maximizedRight: false
39+ readonly property bool maximizedHorizontally: false
40+ readonly property bool maximizedVertically: false
41+ readonly property bool maximizedTopLeft: false
42+ readonly property bool maximizedTopRight: false
43+ readonly property bool maximizedBottomLeft: false
44+ readonly property bool maximizedBottomRight: false
45+ readonly property bool anyMaximized: maximized || maximizedLeft || maximizedRight || maximizedHorizontally || maximizedVertically ||
46+ maximizedTopLeft || maximizedTopRight || maximizedBottomLeft || maximizedBottomRight
47+
48+ readonly property bool canBeCornerMaximized: false
49+ readonly property bool canBeMaximizedLeftRight: false
50+ readonly property bool canBeMaximized: false
51+
52+ readonly property var resizeArea: QtObject {
53+ property real normalWidth: units.gu(1)
54+ property real normalHeight: units.gu(1)
55+ }
56+
57+ readonly property bool windowedTransitionRunning: false
58+
59+ // NB: those bindings will be overwritten by MoveHandler when you first move the window
60+ property real windowedX: x
61+ property real windowedY: y
62+
63+
64+ property real restoredX
65+ property real restoredY
66+
67+ state: "restored"
68+ // end of API expected by MoveHandler
69+ ////
70+
71+ ////
72+ // API expected by WindowResizeArea
73+ property real windowedWidth: childWindow.width
74+ property real windowedHeight: childWindow.height
75+ // end of API expected by WindowResizeArea
76+ ////
77+
78+ ////
79+ // API expected by WindowControlsOverlay
80+ function activate() {
81+ surface.activate();
82+ }
83+ // end of API expected by WindowControlsOverlay
84+ ////
85+
86+ Binding {
87+ target: root.surface
88+ when: childWindow.dragging
89+ property: "requestedPosition"
90+ value: Qt.point(root.windowedX - root.displacementX,
91+ root.windowedY - root.displacementY);
92+ }
93+
94+ // It's a separate Item so that a window can be hid independently of its children
95+ ChildWindow {
96+ id: childWindow
97+ target: root
98+ requestedWidth: root.windowedWidth
99+ requestedHeight: root.windowedHeight
100+ }
101+
102+ Connections {
103+ target: root.surface
104+ onFocusRequested: {
105+ root.surface.activate();
106+ }
107+ }
108+
109+ // Using a loader here mainly to circunvent the "ChildWindowTree is instantiated recursively" error from the QML engine
110+ Loader {
111+ id: childRepeaterLoader
112+ source: "ChildWindowRepeater.qml"
113+ active: root.surface && root.surface.childSurfaceList.count > 0
114+ Binding {
115+ target: childRepeaterLoader.item
116+ when: childRepeaterLoader.item
117+ property: "model"
118+ value: root.surface ? root.surface.childSurfaceList : null
119+ }
120+ Binding {
121+ target: childRepeaterLoader.item
122+ when: childRepeaterLoader.item
123+ property: "boundsItem"
124+ value: root.boundsItem
125+ }
126+ }
127+}
qml/Stage/DecoratedWindow.qml+1−2
@@ -67,8 +67,7 @@ FocusScope {
67 readonly property int heightIncrement: !counterRotate ? applicationWindow.heightIncrement : applicationWindow.widthIncrement
67 readonly property int heightIncrement: !counterRotate ? applicationWindow.heightIncrement : applicationWindow.widthIncrement
68
68
69 property alias overlayShown: decoration.overlayShown
69 property alias overlayShown: decoration.overlayShown
70− property alias stageWidth: moveHandler.stageWidth
70+ property alias boundsItem: moveHandler.boundsItem
71− property alias stageHeight: moveHandler.stageHeight
72 readonly property alias dragging: moveHandler.dragging
71 readonly property alias dragging: moveHandler.dragging
73
72
74 readonly property Item clientAreaItem: applicationWindow
73 readonly property Item clientAreaItem: applicationWindow
qml/Stage/MoveHandler.qml+23−18
@@ -19,15 +19,14 @@ import Unity.Application 0.1 // For Mir singleton
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20import Utils 0.1
20import Utils 0.1
21import "../Components"
21import "../Components"
22−import "../Components/PanelState"
23
22
24QtObject {
23QtObject {
25 id: root
24 id: root
26
25
27 property Item target // appDelegate
26 property Item target // appDelegate
28− property int stageWidth
29− property int stageHeight
30 property real buttonsWidth: 0
27 property real buttonsWidth: 0
28+ property Item boundsItem
29+ property real boundsTopMargin: 0
31
30
32 readonly property bool dragging: priv.dragging
31 readonly property bool dragging: priv.dragging
33
32
@@ -79,7 +78,10 @@ QtObject {
79 // length of the triggerArea square diagonal
78 // length of the triggerArea square diagonal
80 var diagLength = Math.sqrt(2 * priv.triggerArea * priv.triggerArea);
79 var diagLength = Math.sqrt(2 * priv.triggerArea * priv.triggerArea);
81 var ratio = 1 - (distance / diagLength);
80 var ratio = 1 - (distance / diagLength);
81+
82− return bx > 0 && bx <= stageWidth && by > 0 && by <= stageHeight ? ratio : 1; // everything "outside" of our square from the center is 1
82+ // everything "outside" of our square from the center is 1
83+ var mousePosBoundsCoords = target.mapToItem(root.boundsItem, bx, by);
84+ return root.boundsItem.contains(mousePosBoundsCoords) ? ratio : 1;
83 }
85 }
84 property real progress: 0
86 property real progress: 0
85 }
87 }
@@ -117,35 +119,38 @@ QtObject {
117 target.requestRestore();
119 target.requestRestore();
118 }
120 }
119
121
120− var pos = mapToItem(target.parent, mouse.x, mouse.y);
122+ var pos = mapToItem(target.parent, mouse.x, mouse.y); // How can that work if we're just a QtObject (not an Item)?
123+ var bounds = boundsItem.mapToItem(target.parent, 0, 0, boundsItem.width, boundsItem.height);
124+ bounds.y += boundsTopMargin;
125+ bounds.height -= boundsTopMargin;
121 // Use integer coordinate values to ensure that target is left in a pixel-aligned
126 // Use integer coordinate values to ensure that target is left in a pixel-aligned
122 // position. Mouse movement could have subpixel precision, yielding a fractional
127 // position. Mouse movement could have subpixel precision, yielding a fractional
123 // mouse position.
128 // mouse position.
124 target.windowedX = Math.round(pos.x - priv.distanceX);
129 target.windowedX = Math.round(pos.x - priv.distanceX);
125− target.windowedY = Math.round(Math.max(pos.y - priv.distanceY, PanelState.panelHeight));
130+ target.windowedY = Math.round(Math.max(pos.y - priv.distanceY, bounds.top));
126
131
127 if (sensingPoints) { // edge/corner detection when dragging via the touch overlay
132 if (sensingPoints) { // edge/corner detection when dragging via the touch overlay
128− if (sensingPoints.topLeft.x < priv.triggerArea && sensingPoints.topLeft.y < PanelState.panelHeight + priv.triggerArea
133+ if (sensingPoints.topLeft.x < priv.triggerArea && sensingPoints.topLeft.y < bounds.top + priv.triggerArea
129 && target.canBeCornerMaximized) { // top left
134 && target.canBeCornerMaximized) { // top left
130− priv.progress = priv.progressInCorner(0, PanelState.panelHeight, sensingPoints.topLeft.x, sensingPoints.topLeft.y);
135+ priv.progress = priv.progressInCorner(bounds.left, bounds.top, sensingPoints.topLeft.x, sensingPoints.topLeft.y);
131 priv.resetEdges();
136 priv.resetEdges();
132 priv.nearTopLeftCorner = true;
137 priv.nearTopLeftCorner = true;
133 root.fakeMaximizeTopLeftAnimationRequested(priv.progress);
138 root.fakeMaximizeTopLeftAnimationRequested(priv.progress);
134− } else if (sensingPoints.topRight.x > stageWidth - priv.triggerArea && sensingPoints.topRight.y < PanelState.panelHeight + priv.triggerArea
139+ } else if (sensingPoints.topRight.x > bounds.right - priv.triggerArea && sensingPoints.topRight.y < bounds.top + priv.triggerArea
135 && target.canBeCornerMaximized) { // top right
140 && target.canBeCornerMaximized) { // top right
136− priv.progress = priv.progressInCorner(stageWidth, PanelState.panelHeight, sensingPoints.topRight.x, sensingPoints.topRight.y);
141+ priv.progress = priv.progressInCorner(bounds.right, bounds.top, sensingPoints.topRight.x, sensingPoints.topRight.y);
137 priv.resetEdges();
142 priv.resetEdges();
138 priv.nearTopRightCorner = true;
143 priv.nearTopRightCorner = true;
139 root.fakeMaximizeTopRightAnimationRequested(priv.progress);
144 root.fakeMaximizeTopRightAnimationRequested(priv.progress);
140− } else if (sensingPoints.bottomLeft.x < priv.triggerArea && sensingPoints.bottomLeft.y > stageHeight - priv.triggerArea
145+ } else if (sensingPoints.bottomLeft.x < priv.triggerArea && sensingPoints.bottomLeft.y > bounds.bottom - priv.triggerArea
141 && target.canBeCornerMaximized) { // bottom left
146 && target.canBeCornerMaximized) { // bottom left
142− priv.progress = priv.progressInCorner(0, stageHeight, sensingPoints.bottomLeft.x, sensingPoints.bottomLeft.y);
147+ priv.progress = priv.progressInCorner(bounds.left, bounds.bottom, sensingPoints.bottomLeft.x, sensingPoints.bottomLeft.y);
143 priv.resetEdges();
148 priv.resetEdges();
144 priv.nearBottomLeftCorner = true;
149 priv.nearBottomLeftCorner = true;
145 root.fakeMaximizeBottomLeftAnimationRequested(priv.progress);
150 root.fakeMaximizeBottomLeftAnimationRequested(priv.progress);
146− } else if (sensingPoints.bottomRight.x > stageWidth - priv.triggerArea && sensingPoints.bottomRight.y > stageHeight - priv.triggerArea
151+ } else if (sensingPoints.bottomRight.x > bounds.right - priv.triggerArea && sensingPoints.bottomRight.y > bounds.bottom - priv.triggerArea
147 && target.canBeCornerMaximized) { // bottom right
152 && target.canBeCornerMaximized) { // bottom right
148− priv.progress = priv.progressInCorner(stageWidth, stageHeight, sensingPoints.bottomRight.x, sensingPoints.bottomRight.y);
153+ priv.progress = priv.progressInCorner(bounds.right, bounds.bottom, sensingPoints.bottomRight.x, sensingPoints.bottomRight.y);
149 priv.resetEdges();
154 priv.resetEdges();
150 priv.nearBottomRightCorner = true;
155 priv.nearBottomRightCorner = true;
151 root.fakeMaximizeBottomRightAnimationRequested(priv.progress);
156 root.fakeMaximizeBottomRightAnimationRequested(priv.progress);
@@ -154,13 +159,13 @@ QtObject {
154 priv.resetEdges();
159 priv.resetEdges();
155 priv.nearLeftEdge = true;
160 priv.nearLeftEdge = true;
156 root.fakeMaximizeLeftAnimationRequested(priv.progress);
161 root.fakeMaximizeLeftAnimationRequested(priv.progress);
157− } else if (sensingPoints.right.x > stageWidth - priv.triggerArea && target.canBeMaximizedLeftRight) { // right
162+ } else if (sensingPoints.right.x > bounds.right - priv.triggerArea && target.canBeMaximizedLeftRight) { // right
158− priv.progress = MathUtils.clampAndProject(sensingPoints.right.x, stageWidth - priv.triggerArea, stageWidth, 0, 1);
163+ priv.progress = MathUtils.clampAndProject(sensingPoints.right.x, bounds.right - priv.triggerArea, bounds.right, 0, 1);
159 priv.resetEdges();
164 priv.resetEdges();
160 priv.nearRightEdge = true;
165 priv.nearRightEdge = true;
161 root.fakeMaximizeRightAnimationRequested(priv.progress);
166 root.fakeMaximizeRightAnimationRequested(priv.progress);
162− } else if (sensingPoints.top.y < PanelState.panelHeight + priv.triggerArea && target.canBeMaximized) { // top
167+ } else if (sensingPoints.top.y < bounds.top + priv.triggerArea && target.canBeMaximized) { // top
163− priv.progress = MathUtils.clampAndProject(sensingPoints.top.y, PanelState.panelHeight + priv.triggerArea, 0, 0, 1);
168+ priv.progress = MathUtils.clampAndProject(sensingPoints.top.y, bounds.top + priv.triggerArea, 0, 0, 1);
164 priv.resetEdges();
169 priv.resetEdges();
165 priv.nearTopEdge = true;
170 priv.nearTopEdge = true;
166 root.fakeMaximizeAnimationRequested(priv.progress);
171 root.fakeMaximizeAnimationRequested(priv.progress);
qml/Stage/Stage.qml+50−9
@@ -100,7 +100,7 @@ FocusScope {
100 } else {
100 } else {
101 // No we didn't, do a quick alt-tab
101 // No we didn't, do a quick alt-tab
102 if (appRepeater.count > 1) {
102 if (appRepeater.count > 1) {
103− appRepeater.itemAt(1).claimFocus();
103+ appRepeater.itemAt(1).activate();
104 }
104 }
105 }
105 }
106 }
106 }
@@ -665,6 +665,13 @@ FocusScope {
665 }
665 }
666 }
666 }
667
667
668+ Item {
669+ id: boundariesForWindowPlacement
670+ anchors.fill: parent
671+ anchors.topMargin: PanelState.panelHeight
672+ visible: false
673+ }
674+
668 Repeater {
675 Repeater {
669 id: appRepeater
676 id: appRepeater
670 model: topLevelSurfaceList
677 model: topLevelSurfaceList
@@ -833,7 +840,6 @@ FocusScope {
833 readonly property var surface: model.window.surface
840 readonly property var surface: model.window.surface
834 readonly property var window: model.window
841 readonly property var window: model.window
835
842
836− readonly property alias resizeArea: resizeArea
837 readonly property alias focusedSurface: decoratedWindow.focusedSurface
843 readonly property alias focusedSurface: decoratedWindow.focusedSurface
838 readonly property bool dragging: touchControls.overlayShown ? touchControls.dragging : decoratedWindow.dragging
844 readonly property bool dragging: touchControls.overlayShown ? touchControls.dragging : decoratedWindow.dragging
839
845
@@ -890,7 +896,7 @@ FocusScope {
890 screenWidth: appContainer.width
896 screenWidth: appContainer.width
891 screenHeight: appContainer.height
897 screenHeight: appContainer.height
892 leftMargin: root.leftMargin
898 leftMargin: root.leftMargin
893− minimumY: PanelState.panelHeight
899+ minimumY: boundariesForWindowPlacement.y
894 }
900 }
895
901
896 Connections {
902 Connections {
@@ -1520,7 +1526,7 @@ FocusScope {
1520 anchors.margins: touchControls.overlayShown ? borderThickness/2 : -borderThickness
1526 anchors.margins: touchControls.overlayShown ? borderThickness/2 : -borderThickness
1521
1527
1522 target: appDelegate
1528 target: appDelegate
1523− minimumY: PanelState.panelHeight // disallow resizing up past Panel
1529+ boundsItem: boundariesForWindowPlacement
1524 minWidth: units.gu(10)
1530 minWidth: units.gu(10)
1525 minHeight: units.gu(10)
1531 minHeight: units.gu(10)
1526 borderThickness: units.gu(2)
1532 borderThickness: units.gu(2)
@@ -1539,7 +1545,7 @@ FocusScope {
1539 anchors.top: appDelegate.top
1545 anchors.top: appDelegate.top
1540 application: model.application
1546 application: model.application
1541 surface: model.window.surface
1547 surface: model.window.surface
1542− active: appDelegate.focus
1548+ active: model.window.focused
1543 focus: true
1549 focus: true
1544 interactive: root.interactive
1550 interactive: root.interactive
1545 showDecoration: 1
1551 showDecoration: 1
@@ -1548,8 +1554,7 @@ FocusScope {
1548 width: implicitWidth
1554 width: implicitWidth
1549 height: implicitHeight
1555 height: implicitHeight
1550 highlightSize: windowInfoItem.iconMargin / 2
1556 highlightSize: windowInfoItem.iconMargin / 2
1551− stageWidth: appContainer.width
1557+ boundsItem: boundariesForWindowPlacement
1552− stageHeight: appContainer.height
1553
1558
1554 requestedWidth: appDelegate.requestedWidth
1559 requestedWidth: appDelegate.requestedWidth
1555 requestedHeight: appDelegate.requestedHeight
1560 requestedHeight: appDelegate.requestedHeight
@@ -1604,11 +1609,12 @@ FocusScope {
1604
1609
1605 WindowControlsOverlay {
1610 WindowControlsOverlay {
1606 id: touchControls
1611 id: touchControls
1612+ anchors.fill: appDelegate
1607 target: appDelegate
1613 target: appDelegate
1614+ resizeArea: resizeArea
1608 enabled: false
1615 enabled: false
1609 visible: enabled
1616 visible: enabled
1610− stageWidth: appContainer.width
1617+ boundsItem: boundariesForWindowPlacement
1611− stageHeight: appContainer.height
1612
1618
1613 onFakeMaximizeAnimationRequested: if (!appDelegate.maximized) fakeRectangle.maximize(amount, true)
1619 onFakeMaximizeAnimationRequested: if (!appDelegate.maximized) fakeRectangle.maximize(amount, true)
1614 onFakeMaximizeLeftAnimationRequested: if (!appDelegate.maximizedLeft) fakeRectangle.maximizeLeft(amount, true)
1620 onFakeMaximizeLeftAnimationRequested: if (!appDelegate.maximizedLeft) fakeRectangle.maximizeLeft(amount, true)
@@ -1703,6 +1709,41 @@ FocusScope {
1703 sourceSize.height: height
1709 sourceSize.height: height
1704 }
1710 }
1705 }
1711 }
1712+
1713+ Item {
1714+ // Group all child windows in this item so that we can fade them out together when going to the spread
1715+ // (and fade them in back again when returning from it)
1716+ readonly property bool stageOnProperState: root.state === "windowed"
1717+ || root.state === "staged"
1718+ || root.state === "stagedWithSideStage"
1719+
1720+ // TODO: Is it worth the extra cost of layering to avoid the opacity artifacts of intersecting children?
1721+ // Btw, will involve more than uncommenting the line below as children won't necessarily fit this item's
1722+ // geometry. This is just a reference.
1723+ //layer.enabled: opacity !== 0.0 && opacity !== 1.0
1724+
1725+ opacity: stageOnProperState ? 1.0 : 0.0
1726+ visible: opacity !== 0.0 // make it transparent to input as well
1727+ Behavior on opacity { UbuntuNumberAnimation {} }
1728+
1729+ Repeater {
1730+ id: childWindowRepeater
1731+ model: appDelegate.surface ? appDelegate.surface.childSurfaceList : null
1732+
1733+ delegate: ChildWindowTree {
1734+ surface: model.surface
1735+
1736+ // Account for the displacement caused by window decoration in the top-level surface
1737+ // Ie, the top-level surface is not positioned at (0,0) of this ChildWindow's parent (appDelegate)
1738+ displacementX: appDelegate.clientAreaItem.x
1739+ displacementY: appDelegate.clientAreaItem.y
1740+
1741+ boundsItem: boundariesForWindowPlacement
1742+
1743+ z: childWindowRepeater.count - model.index
1744+ }
1745+ }
1746+ }
1706 }
1747 }
1707 }
1748 }
1708 }
1749 }
qml/Stage/WindowControlsOverlay.qml+21−24
@@ -18,17 +18,14 @@ import QtQuick 2.4
18import Ubuntu.Components 1.3
18import Ubuntu.Components 1.3
19import Ubuntu.Gestures 0.1
19import Ubuntu.Gestures 0.1
20import Unity.Application 0.1
20import Unity.Application 0.1
21−import "../Components/PanelState"
22
21
23Item {
22Item {
24 id: root
23 id: root
25− enabled: target && !target.fullscreen
26− anchors.fill: target
27
24
28 // to be set from outside
25 // to be set from outside
29 property Item target // appDelegate
26 property Item target // appDelegate
30− property alias stageWidth: moveHandler.stageWidth
27+ property WindowResizeArea resizeArea
31− property alias stageHeight: moveHandler.stageHeight
28+ property Item boundsItem
32
29
33 // to be read from outside
30 // to be read from outside
34 readonly property alias overlayShown: overlay.visible
31 readonly property alias overlayShown: overlay.visible
@@ -90,9 +87,7 @@ Item {
90
87
91 QtObject {
88 QtObject {
92 id: priv
89 id: priv
93− readonly property var resizeArea: root.target && root.target.resizeArea ? root.target.resizeArea : null
94− readonly property bool ensureWindow: root.target.state == "normal" || root.target.state == "restored"
95− readonly property bool dragging: moveHandler.dragging || (resizeArea && resizeArea.dragging)
90+ readonly property bool dragging: moveHandler.dragging || (root.resizeArea && root.resizeArea.dragging)
96
91
97 function getSensingPoints() {
92 function getSensingPoints() {
98 var xPoints = [];
93 var xPoints = [];
@@ -162,6 +157,8 @@ Item {
162 objectName: "moveHandler"
157 objectName: "moveHandler"
163 target: root.target
158 target: root.target
164
159
160+ boundsItem: root.boundsItem
161+
165 onFakeMaximizeAnimationRequested: root.fakeMaximizeAnimationRequested(amount)
162 onFakeMaximizeAnimationRequested: root.fakeMaximizeAnimationRequested(amount)
166 onFakeMaximizeLeftAnimationRequested: root.fakeMaximizeLeftAnimationRequested(amount)
163 onFakeMaximizeLeftAnimationRequested: root.fakeMaximizeLeftAnimationRequested(amount)
167 onFakeMaximizeRightAnimationRequested: root.fakeMaximizeRightAnimationRequested(amount)
164 onFakeMaximizeRightAnimationRequested: root.fakeMaximizeRightAnimationRequested(amount)
@@ -193,65 +190,65 @@ Item {
193 ResizeGrip { // top left
190 ResizeGrip { // top left
194 anchors.horizontalCenter: parent.left
191 anchors.horizontalCenter: parent.left
195 anchors.verticalCenter: parent.top
192 anchors.verticalCenter: parent.top
196− visible: priv.ensureWindow || target.maximizedBottomRight
193+ visible: root.enabled || target.maximizedBottomRight
197− resizeTarget: priv.resizeArea
194+ resizeTarget: root.resizeArea
198 }
195 }
199
196
200 ResizeGrip { // top center
197 ResizeGrip { // top center
201 anchors.horizontalCenter: parent.horizontalCenter
198 anchors.horizontalCenter: parent.horizontalCenter
202 anchors.verticalCenter: parent.top
199 anchors.verticalCenter: parent.top
203 rotation: 45
200 rotation: 45
204− visible: priv.ensureWindow || target.maximizedHorizontally || target.maximizedBottomLeft || target.maximizedBottomRight
201+ visible: root.enabled || target.maximizedHorizontally || target.maximizedBottomLeft || target.maximizedBottomRight
205− resizeTarget: priv.resizeArea
202+ resizeTarget: root.resizeArea
206 }
203 }
207
204
208 ResizeGrip { // top right
205 ResizeGrip { // top right
209 anchors.horizontalCenter: parent.right
206 anchors.horizontalCenter: parent.right
210 anchors.verticalCenter: parent.top
207 anchors.verticalCenter: parent.top
211 rotation: 90
208 rotation: 90
212− visible: priv.ensureWindow || target.maximizedBottomLeft
209+ visible: root.enabled || target.maximizedBottomLeft
213− resizeTarget: priv.resizeArea
210+ resizeTarget: root.resizeArea
214 }
211 }
215
212
216 ResizeGrip { // right
213 ResizeGrip { // right
217 anchors.horizontalCenter: parent.right
214 anchors.horizontalCenter: parent.right
218 anchors.verticalCenter: parent.verticalCenter
215 anchors.verticalCenter: parent.verticalCenter
219 rotation: 135
216 rotation: 135
220− visible: priv.ensureWindow || target.maximizedVertically || target.maximizedLeft ||
217+ visible: root.enabled || target.maximizedVertically || target.maximizedLeft ||
221 target.maximizedTopLeft || target.maximizedBottomLeft
218 target.maximizedTopLeft || target.maximizedBottomLeft
222− resizeTarget: priv.resizeArea
219+ resizeTarget: root.resizeArea
223 }
220 }
224
221
225 ResizeGrip { // bottom right
222 ResizeGrip { // bottom right
226 anchors.horizontalCenter: parent.right
223 anchors.horizontalCenter: parent.right
227 anchors.verticalCenter: parent.bottom
224 anchors.verticalCenter: parent.bottom
228− visible: priv.ensureWindow || target.maximizedTopLeft
225+ visible: root.enabled || target.maximizedTopLeft
229− resizeTarget: priv.resizeArea
226+ resizeTarget: root.resizeArea
230 }
227 }
231
228
232 ResizeGrip { // bottom center
229 ResizeGrip { // bottom center
233 anchors.horizontalCenter: parent.horizontalCenter
230 anchors.horizontalCenter: parent.horizontalCenter
234 anchors.verticalCenter: parent.bottom
231 anchors.verticalCenter: parent.bottom
235 rotation: 45
232 rotation: 45
236− visible: priv.ensureWindow || target.maximizedHorizontally || target.maximizedTopLeft || target.maximizedTopRight
233+ visible: root.enabled || target.maximizedHorizontally || target.maximizedTopLeft || target.maximizedTopRight
237− resizeTarget: priv.resizeArea
234+ resizeTarget: root.resizeArea
238 }
235 }
239
236
240 ResizeGrip { // bottom left
237 ResizeGrip { // bottom left
241 anchors.horizontalCenter: parent.left
238 anchors.horizontalCenter: parent.left
242 anchors.verticalCenter: parent.bottom
239 anchors.verticalCenter: parent.bottom
243 rotation: 90
240 rotation: 90
244− visible: priv.ensureWindow || target.maximizedTopRight
241+ visible: root.enabled || target.maximizedTopRight
245− resizeTarget: priv.resizeArea
242+ resizeTarget: root.resizeArea
246 }
243 }
247
244
248 ResizeGrip { // left
245 ResizeGrip { // left
249 anchors.horizontalCenter: parent.left
246 anchors.horizontalCenter: parent.left
250 anchors.verticalCenter: parent.verticalCenter
247 anchors.verticalCenter: parent.verticalCenter
251 rotation: 135
248 rotation: 135
252− visible: priv.ensureWindow || target.maximizedVertically || target.maximizedRight ||
249+ visible: root.enabled || target.maximizedVertically || target.maximizedRight ||
253 target.maximizedTopRight || target.maximizedBottomRight
250 target.maximizedTopRight || target.maximizedBottomRight
254− resizeTarget: priv.resizeArea
251+ resizeTarget: root.resizeArea
255 }
252 }
256 }
253 }
257}
254}
qml/Stage/WindowDecoration.qml+1
@@ -28,6 +28,7 @@ MouseArea {
28 property alias closeButtonVisible: buttons.closeButtonShown
28 property alias closeButtonVisible: buttons.closeButtonShown
29 property alias title: titleLabel.text
29 property alias title: titleLabel.text
30 property alias maximizeButtonShown: buttons.maximizeButtonShown
30 property alias maximizeButtonShown: buttons.maximizeButtonShown
31+ property alias minimizeButtonVisible: buttons.minimizeButtonVisible
31 property bool active: false
32 property bool active: false
32 property alias overlayShown: buttons.overlayShown
33 property alias overlayShown: buttons.overlayShown
33 property var menu: undefined
34 property var menu: undefined
qml/Stage/WindowResizeArea.qml+3−2
@@ -32,7 +32,7 @@ MouseArea {
32 // The area will anchor to it and manage resize events
32 // The area will anchor to it and manage resize events
33 property Item target: null
33 property Item target: null
34 property int borderThickness: 0
34 property int borderThickness: 0
35− property real minimumY: -100000000 // By default, impose no limit
35+ property Item boundsItem
36 property int minWidth: 0
36 property int minWidth: 0
37 property int minHeight: 0
37 property int minHeight: 0
38
38
@@ -243,7 +243,8 @@ MouseArea {
243 }
243 }
244
244
245 if (d.topBorder) {
245 if (d.topBorder) {
246+ var bounds = boundsItem.mapToItem(target.parent, 0, 0, boundsItem.width, boundsItem.height);
246− var newTargetY = Math.max(d.startY + deltaY, root.minimumY);
247+ var newTargetY = Math.max(d.startY + deltaY, bounds.y);
247 var bottomBorderY = target.windowedY + target.height;
248 var bottomBorderY = target.windowedY + target.height;
248 if (bottomBorderY > newTargetY + d.minimumHeight) {
249 if (bottomBorderY > newTargetY + d.minimumHeight) {
249 if (bottomBorderY < newTargetY + d.maximumHeight) {
250 if (bottomBorderY < newTargetY + d.maximumHeight) {
tests/mocks/Unity/Application/ApplicationInfo.cpp+9−1
@@ -94,6 +94,7 @@ void ApplicationInfo::createPromptSurface()
94 auto surface = surfaceManager->createSurface(QString("prompt foo"),
94 auto surface = surfaceManager->createSurface(QString("prompt foo"),
95 Mir::NormalType,
95 Mir::NormalType,
96 Mir::RestoredState,
96 Mir::RestoredState,
97+ nullptr, /* parentSurface */
97 screenshotUrl);
98 screenshotUrl);
98 surfaceManager->notifySurfaceCreated(surface);
99 surfaceManager->notifySurfaceCreated(surface);
99
100
@@ -122,7 +123,9 @@ void ApplicationInfo::createSurface()
122 auto surface = surfaceManager->createSurface(surfaceName,
123 auto surface = surfaceManager->createSurface(surfaceName,
123 Mir::NormalType,
124 Mir::NormalType,
124 fullscreen() ? Mir::FullscreenState : Mir::RestoredState,
125 fullscreen() ? Mir::FullscreenState : Mir::RestoredState,
126+ nullptr, /* parentSurface */
125− m_screenshotFileName);
127+ m_screenshotFileName,
128+ m_qmlFilePath);
126
129
127 surface->setShellChrome(m_shellChrome);
130 surface->setShellChrome(m_shellChrome);
128
131
@@ -201,6 +204,11 @@ void ApplicationInfo::setScreenshotId(const QString &screenshotId)
201 }
204 }
202}
205}
203
206
207+void ApplicationInfo::setQmlFilename(const QString &qmlFilename)
208+{
209+ m_qmlFilePath = QString("qrc:///Unity/Application/%1").arg(qmlFilename);
210+}
211+
204void ApplicationInfo::setName(const QString &value)
212void ApplicationInfo::setName(const QString &value)
205{
213{
206 if (value != m_name) {
214 if (value != m_name) {
tests/mocks/Unity/Application/ApplicationInfo.h+3
@@ -29,6 +29,7 @@ class MirSurface;
29
29
30#include <QList>
30#include <QList>
31#include <QTimer>
31#include <QTimer>
32+#include <QUrl>
32
33
33using namespace unity::shell::application;
34using namespace unity::shell::application;
34
35
@@ -58,6 +59,7 @@ public:
58
59
59 void setIconId(const QString &iconId);
60 void setIconId(const QString &iconId);
60 void setScreenshotId(const QString &screenshotId);
61 void setScreenshotId(const QString &screenshotId);
62+ void setQmlFilename(const QString &);
61
63
62 void setAppId(const QString &value) { m_appId = value; }
64 void setAppId(const QString &value) { m_appId = value; }
63 QString appId() const override { return m_appId; }
65 QString appId() const override { return m_appId; }
@@ -152,6 +154,7 @@ private:
152 QList<MirSurface*> m_closingSurfaces;
154 QList<MirSurface*> m_closingSurfaces;
153 bool m_manualSurfaceCreation{false};
155 bool m_manualSurfaceCreation{false};
154 Mir::ShellChrome m_shellChrome{Mir::NormalChrome};
156 Mir::ShellChrome m_shellChrome{Mir::NormalChrome};
157+ QUrl m_qmlFilePath;
155};
158};
156
159
157Q_DECLARE_METATYPE(ApplicationInfo*)
160Q_DECLARE_METATYPE(ApplicationInfo*)
tests/mocks/Unity/Application/ApplicationManager.cpp+9
@@ -480,6 +480,15 @@ void ApplicationManager::buildListOfAvailableApplications()
480 application->setName("Primary Oriented");
480 application->setName("Primary Oriented");
481 application->setSupportedOrientations(Qt::PrimaryOrientation);
481 application->setSupportedOrientations(Qt::PrimaryOrientation);
482 m_availableApplications.append(application);
482 m_availableApplications.append(application);
483+
484+ application = new ApplicationInfo(this);
485+ application->setAppId("kate");
486+ application->setName("Kate");
487+ application->setIconId("libreoffice");
488+ application->setScreenshotId("libreoffice");
489+ application->setQmlFilename("Kate.qml");
490+ application->setIsTouchApp(false);
491+ m_availableApplications.append(application);
483}
492}
484
493
485
494
tests/mocks/Unity/Application/MirSurface.cpp+43
@@ -74,6 +74,7 @@ using namespace unity::shell::application;
74MirSurface::MirSurface(const QString& name,
74MirSurface::MirSurface(const QString& name,
75 Mir::Type type,
75 Mir::Type type,
76 Mir::State state,
76 Mir::State state,
77+ MirSurface *parentSurface,
77 const QUrl& screenshot,
78 const QUrl& screenshot,
78 const QUrl &qmlFilePath)
79 const QUrl &qmlFilePath)
79 : unity::shell::application::MirSurfaceInterface(nullptr)
80 : unity::shell::application::MirSurfaceInterface(nullptr)
@@ -90,6 +91,8 @@ MirSurface::MirSurface(const QString& name,
90 , m_height(-1)
91 , m_height(-1)
91 , m_slowToResize(false)
92 , m_slowToResize(false)
92 , m_shellChrome(Mir::NormalChrome)
93 , m_shellChrome(Mir::NormalChrome)
94+ , m_parentSurface(parentSurface)
95+ , m_childSurfaceList(new MirSurfaceListModel(this))
93{
96{
94 DEBUG_MSG("state=" << stateToStr(state));
97 DEBUG_MSG("state=" << stateToStr(state));
95
98
@@ -493,6 +496,36 @@ void MirSurface::setInputBounds(const QRect &boundsRect)
493 }
496 }
494}
497}
495
498
499+void MirSurface::openMenu(qreal x, qreal y, qreal width, qreal height)
500+{
501+ auto *menu = SurfaceManager::instance()->createSurface("menu", Mir::MenuType, Mir::HiddenState,
502+ this /* parentSurface */,
503+ QUrl() /* screenshot */,
504+ QUrl("qrc:///Unity/Application/KateMenu.qml"));
505+
506+ menu->setRequestedPosition(QPoint(x,y));
507+ menu->resize(width, height);
508+ menu->requestState(Mir::RestoredState);
509+
510+ SurfaceManager::instance()->notifySurfaceCreated(menu);
511+}
512+
513+void MirSurface::openDialog(qreal x, qreal y, qreal width, qreal height)
514+{
515+ auto *dialog = SurfaceManager::instance()->createSurface("dialog", Mir::DialogType, Mir::HiddenState,
516+ this /* parentSurface */,
517+ QUrl() /* screenshot */,
518+ QUrl("qrc:///Unity/Application/KateDialog.qml"));
519+
520+ dialog->setRequestedPosition(QPoint(x,y));
521+ dialog->resize(width, height);
522+ dialog->requestState(Mir::RestoredState);
523+
524+ SurfaceManager::instance()->notifySurfaceCreated(dialog);
525+
526+ dialog->requestFocus();
527+}
528+
496void MirSurface::setRequestedPosition(const QPoint &value)
529void MirSurface::setRequestedPosition(const QPoint &value)
497{
530{
498 if (value != m_requestedPosition) {
531 if (value != m_requestedPosition) {
@@ -505,3 +538,13 @@ void MirSurface::setRequestedPosition(const QPoint &value)
505 Q_EMIT positionChanged(m_position);
538 Q_EMIT positionChanged(m_position);
506 }
539 }
507}
540}
541+
542+MirSurfaceInterface* MirSurface::parentSurface() const
543+{
544+ return m_parentSurface;
545+}
546+
547+MirSurfaceListInterface* MirSurface::childSurfaceList() const
548+{
549+ return m_childSurfaceList;
550+}
tests/mocks/Unity/Application/MirSurface.h+11
@@ -45,6 +45,7 @@ public:
45 MirSurface(const QString& name,
45 MirSurface(const QString& name,
46 Mir::Type type,
46 Mir::Type type,
47 Mir::State state,
47 Mir::State state,
48+ MirSurface *parentSurface,
48 const QUrl& screenshot,
49 const QUrl& screenshot,
49 const QUrl &qmlFilePath = QUrl());
50 const QUrl &qmlFilePath = QUrl());
50 virtual ~MirSurface();
51 virtual ~MirSurface();
@@ -94,6 +95,9 @@ public:
94 QPoint requestedPosition() const override { return m_requestedPosition; }
95 QPoint requestedPosition() const override { return m_requestedPosition; }
95 void setRequestedPosition(const QPoint &) override;
96 void setRequestedPosition(const QPoint &) override;
96
97
98+ unity::shell::application::MirSurfaceInterface* parentSurface() const override;
99+ unity::shell::application::MirSurfaceListInterface* childSurfaceList() const override;
100+
97 Q_INVOKABLE void close() override;
101 Q_INVOKABLE void close() override;
98 Q_INVOKABLE void activate() override;
102 Q_INVOKABLE void activate() override;
99
103
@@ -121,6 +125,9 @@ public:
121
125
122 Q_INVOKABLE virtual void setInputBounds(const QRect &boundsRect);
126 Q_INVOKABLE virtual void setInputBounds(const QRect &boundsRect);
123
127
128+ Q_INVOKABLE void openMenu(qreal x, qreal y, qreal width, qreal height);
129+ Q_INVOKABLE void openDialog(qreal x, qreal y, qreal width, qreal height);
130+
124 /////
131 /////
125 // internal mock stuff
132 // internal mock stuff
126
133
@@ -216,6 +223,10 @@ private:
216
223
217 QPoint m_position;
224 QPoint m_position;
218 QPoint m_requestedPosition;
225 QPoint m_requestedPosition;
226+
227+ unity::shell::application::MirSurfaceInterface* m_parentSurface;
228+
229+ MirSurfaceListModel *m_childSurfaceList;
219};
230};
220
231
221#endif // MOCK_MIR_SURFACE_H
232#endif // MOCK_MIR_SURFACE_H
tests/mocks/Unity/Application/MirSurfaceItem.cpp+19−4
@@ -159,7 +159,9 @@ void MirSurfaceItem::setOrientationAngle(Mir::OrientationAngle angle)
159
159
160 if (m_qmlItem) {
160 if (m_qmlItem) {
161 QQmlProperty orientationProp(m_qmlItem, "orientationAngle");
161 QQmlProperty orientationProp(m_qmlItem, "orientationAngle");
162+ if (orientationProp.isValid()) {
162− orientationProp.write(QVariant::fromValue(orientationAngle()));
163+ orientationProp.write(QVariant::fromValue(orientationAngle()));
164+ }
163 }
165 }
164}
166}
165
167
@@ -167,7 +169,9 @@ void MirSurfaceItem::updateScreenshot(QUrl screenshotUrl)
167{
169{
168 if (m_qmlItem) {
170 if (m_qmlItem) {
169 QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
171 QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
172+ if (screenshotSource.isValid()) {
170− screenshotSource.write(QVariant::fromValue(screenshotUrl));
173+ screenshotSource.write(QVariant::fromValue(screenshotUrl));
174+ }
171 }
175 }
172}
176}
173
177
@@ -193,12 +197,23 @@ void MirSurfaceItem::createQmlContentItem()
193
197
194 {
198 {
195 QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
199 QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
200+ if (screenshotSource.isValid()) {
196− screenshotSource.write(QVariant::fromValue(m_qmlSurface->screenshotUrl()));
201+ screenshotSource.write(QVariant::fromValue(m_qmlSurface->screenshotUrl()));
202+ }
197 }
203 }
198
204
199 {
205 {
200 QQmlProperty orientationProp(m_qmlItem, "orientationAngle");
206 QQmlProperty orientationProp(m_qmlItem, "orientationAngle");
207+ if (orientationProp.isValid()) {
201− orientationProp.write(QVariant::fromValue(orientationAngle()));
208+ orientationProp.write(QVariant::fromValue(orientationAngle()));
209+ }
210+ }
211+
212+ {
213+ QQmlProperty surfaceProperty(m_qmlItem, "surface");
214+ if (surfaceProperty.isValid()) {
215+ surfaceProperty.write(QVariant::fromValue(m_qmlSurface));
216+ }
202 }
217 }
203}
218}
204
219
tests/mocks/Unity/Application/MirSurfaceListModel.h−1
@@ -44,7 +44,6 @@ public:
44 bool contains(MirSurface *surface) const { return m_surfaceList.contains(surface); }
44 bool contains(MirSurface *surface) const { return m_surfaceList.contains(surface); }
45
45
46private:
46private:
47− void appendSurface(MirSurface *surface);
48 void raise(MirSurface *surface);
47 void raise(MirSurface *surface);
49 void moveSurface(int from, int to);
48 void moveSurface(int from, int to);
50 void connectSurface(MirSurface *surface);
49 void connectSurface(MirSurface *surface);
tests/mocks/Unity/Application/SurfaceManager.cpp+15−8
@@ -61,10 +61,15 @@ SurfaceManager::~SurfaceManager()
61MirSurface *SurfaceManager::createSurface(const QString& name,
61MirSurface *SurfaceManager::createSurface(const QString& name,
62 Mir::Type type,
62 Mir::Type type,
63 Mir::State state,
63 Mir::State state,
64+ MirSurface *parentSurface,
64− const QUrl& screenshot)
65+ const QUrl &screenshot,
66+ const QUrl &qmlFilePath)
65{
67{
66− MirSurface* surface = new MirSurface(name, type, state, screenshot);
68+ MirSurface* surface = new MirSurface(name, type, state, parentSurface, screenshot, qmlFilePath);
67 registerSurface(surface);
69 registerSurface(surface);
70+ if (parentSurface) {
71+ static_cast<MirSurfaceListModel*>(parentSurface->childSurfaceList())->addSurface(surface);
72+ }
68 return surface;
73 return surface;
69}
74}
70
75
@@ -72,12 +77,14 @@ void SurfaceManager::registerSurface(MirSurface *surface)
72{
77{
73 m_surfaces.prepend(surface);
78 m_surfaces.prepend(surface);
74
79
80+ if (!surface->parentSurface()) {
75− surface->setMinimumWidth(m_newSurfaceMinimumWidth);
81+ surface->setMinimumWidth(m_newSurfaceMinimumWidth);
76− surface->setMaximumWidth(m_newSurfaceMaximumWidth);
82+ surface->setMaximumWidth(m_newSurfaceMaximumWidth);
77− surface->setMinimumHeight(m_newSurfaceMinimumHeight);
83+ surface->setMinimumHeight(m_newSurfaceMinimumHeight);
78− surface->setMaximumHeight(m_newSurfaceMaximumHeight);
84+ surface->setMaximumHeight(m_newSurfaceMaximumHeight);
79− surface->setWidthIncrement(m_newSurfaceWidthIncrement);
85+ surface->setWidthIncrement(m_newSurfaceWidthIncrement);
80− surface->setHeightIncrement(m_newSurfaceHeightIncrement);
86+ surface->setHeightIncrement(m_newSurfaceHeightIncrement);
87+ }
81
88
82 connect(surface, &MirSurface::stateRequested, this, [=](Mir::State state) {
89 connect(surface, &MirSurface::stateRequested, this, [=](Mir::State state) {
83 this->onStateRequested(surface, state);
90 this->onStateRequested(surface, state);
tests/mocks/Unity/Application/SurfaceManager.h+3−1
@@ -49,7 +49,9 @@ public:
49 Q_INVOKABLE MirSurface* createSurface(const QString& name,
49 Q_INVOKABLE MirSurface* createSurface(const QString& name,
50 Mir::Type type,
50 Mir::Type type,
51 Mir::State state,
51 Mir::State state,
52+ MirSurface *parentSurface,
52− const QUrl& screenshot);
53+ const QUrl &screenshot,
54+ const QUrl &qmlFilePath = QUrl());
53
55
54
56
55 void notifySurfaceCreated(unity::shell::application::MirSurfaceInterface *);
57 void notifySurfaceCreated(unity::shell::application::MirSurfaceInterface *);
tests/mocks/Unity/Application/VirtualKeyboard.cpp+5−4
@@ -24,10 +24,11 @@
24
24
25VirtualKeyboard::VirtualKeyboard()
25VirtualKeyboard::VirtualKeyboard()
26 : MirSurface("input-method",
26 : MirSurface("input-method",
27− Mir::InputMethodType,
27+ Mir::InputMethodType,
28− Mir::MinimizedState,
28+ Mir::MinimizedState,
29+ nullptr, /* parentSurface */
29− QUrl("qrc:///Unity/Application/vkb_portrait.png"),
30+ QUrl("qrc:///Unity/Application/vkb_portrait.png"),
30− QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"))
31+ QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"))
31{
32{
32}
33}
33
34
tests/mocks/Unity/Application/resources/Kate.qmlnew file+49
@@ -0,0 +1,49 @@
1+/*
2+ * Copyright (C) 2016 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.4
18+import Ubuntu.Components 1.3
19+
20+Rectangle {
21+ id: root
22+ color: "white"
23+ implicitWidth: width
24+ implicitHeight: height
25+
26+ property var surface
27+
28+ Column {
29+ Button {
30+ text: "Open Menu"
31+ property real nextY: y
32+ property real menuHeight: units.gu(5)
33+ onClicked: {
34+ surface.openMenu(x+width, nextY, units.gu(10), menuHeight);
35+ nextY += menuHeight + units.gu(.5)
36+ }
37+ }
38+
39+ Button {
40+ text: "Open Dialog"
41+ property real dialogWidth: units.gu(30)
42+ property real dialogHeight: units.gu(20)
43+ onClicked: {
44+ surface.openDialog(root.x+(root.width/2)-(dialogWidth/2), root.y+(root.height/2)-(dialogHeight/2),
45+ dialogWidth, dialogHeight);
46+ }
47+ }
48+ }
49+}
tests/mocks/Unity/Application/resources/KateDialog.qmlnew file+48
@@ -0,0 +1,48 @@
1+/*
2+ * Copyright (C) 2016 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.4
18+import Ubuntu.Components 1.3
19+
20+Rectangle {
21+ id: root
22+ color: "grey"
23+ implicitWidth: width
24+ implicitHeight: height
25+
26+ property var surface
27+
28+ Text {
29+ anchors.left: parent.left
30+ anchors.right: parent.right
31+ horizontalAlignment: Text.AlignHCenter
32+ verticalAlignment: Text.AlignVCenter
33+ text: "This is a child dialog."
34+ }
35+
36+ Row {
37+ anchors.bottom: parent.bottom
38+ anchors.right: parent.right
39+ Button {
40+ text: "OK"
41+ onClicked: root.surface.close()
42+ }
43+ Button {
44+ text: "Cancel"
45+ onClicked: root.surface.close()
46+ }
47+ }
48+}
tests/mocks/Unity/Application/resources/KateMenu.qmlnew file+41
@@ -0,0 +1,41 @@
1+/*
2+ * Copyright (C) 2016 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.4
18+import Ubuntu.Components 1.3
19+
20+Rectangle {
21+ id: root
22+ color: "grey"
23+ implicitWidth: width
24+ implicitHeight: height
25+
26+ property var surface
27+
28+ Text {
29+ anchors.centerIn: parent
30+ text: "menu"
31+ }
32+ MouseArea {
33+ anchors.fill: parent
34+ property real nextY: 0
35+ onClicked: {
36+ // ensure some overlap with is parent in order to visually check for nested opacity artifacts
37+ root.surface.openMenu(x+(width*0.6), nextY, units.gu(10), root.height);
38+ nextY += root.height
39+ }
40+ }
41+}
tests/mocks/Unity/Application/resources/surfaces.qrc+3
@@ -1,5 +1,8 @@
1<RCC>
1<RCC>
2 <qresource prefix="/Unity/Application">
2 <qresource prefix="/Unity/Application">
3+ <file>Kate.qml</file>
4+ <file>KateDialog.qml</file>
5+ <file>KateMenu.qml</file>
3 <file>VirtualKeyboard.qml</file>
6 <file>VirtualKeyboard.qml</file>
4 <file>MirSurfaceItem.qml</file>
7 <file>MirSurfaceItem.qml</file>
5 <file>vkb_portrait.png</file>
8 <file>vkb_portrait.png</file>
tests/qmltests/Stage/ApplicationCheckBox.qml+1−1
@@ -162,7 +162,7 @@ Column {
162 }
162 }
163 }
163 }
164
164
165− // Rows of application surfaces
165+ // Rows of top-level application surfaces
166 Repeater {
166 Repeater {
167 model: d.application ? d.application.surfaceList : null
167 model: d.application ? d.application.surfaceList : null
168 RowLayout {
168 RowLayout {
tests/qmltests/Stage/tst_WindowResizeArea.qml+10
@@ -90,6 +90,7 @@ Item {
90 id: windowResizeArea
90 id: windowResizeArea
91 anchors.fill: parent
91 anchors.fill: parent
92 target: fakeWindow
92 target: fakeWindow
93+ boundsItem: bounds
93 borderThickness: units.gu(2)
94 borderThickness: units.gu(2)
94 minWidth: units.gu(15)
95 minWidth: units.gu(15)
95 minHeight: units.gu(10)
96 minHeight: units.gu(10)
@@ -121,7 +122,16 @@ Item {
121 active: windowLoaderCheckbox.checked
122 active: windowLoaderCheckbox.checked
122 }
123 }
123
124
125+ Item {
126+ id: bounds
127+ anchors.left: parent.left
128+ anchors.top: parent.top
129+ anchors.right: controls.left
130+ anchors.bottom: parent.bottom
131+ }
132+
124 Rectangle {
133 Rectangle {
134+ id: controls
125 anchors.right: parent.right
135 anchors.right: parent.right
126 anchors.top: parent.top
136 anchors.top: parent.top
127 anchors.bottom: parent.bottom
137 anchors.bottom: parent.bottom