fb2f4b7 · unity8 · git.iko.soy

git.iko.soy/unity8

Fix Z-ordering of prompt surfaces

And also update Unity.Application mock to prepend instead of append new prompt surfaces, like qtmir does.

commitfb2f4b715eec94e1062e4b620edaaaf8fd6efa6d authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateThu 2 Jun 2016, 09:02 (10 years ago) parent7fdbae9

5 files changed+41−12

compare with xenial

unifiedsplit

qml/Stages/ApplicationWindow.qml+25−9 tests/mocks/Unity/Application/MirSurfaceListModel.cpp+13−1 tests/mocks/Unity/Application/MirSurfaceListModel.h+1 tests/qmltests/Stages/ApplicationCheckBox.qml+1−1 tests/qmltests/Stages/tst_ApplicationWindow.qml+1−1

qml/Stages/ApplicationWindow.qml+25−9

@@ -121,15 +121,12 @@ FocusScope {

121121

122122 property bool surfaceOldEnoughToBeResized: false

123123

124− property var focusedSurface: {

125− if (promptSurfacesRepeater.count == 0) {

126− return surfaceContainer;

127− } else {

128− return promptSurfacesRepeater.itemAt(promptSurfacesRepeater.count - 1);

129− }

130− }

124+ property Item focusedSurface: promptSurfacesRepeater.count === 0 ? surfaceContainer

125+ : promptSurfacesRepeater.first

131126 onFocusedSurfaceChanged: {

132− focusedSurface.focus = true;

127+ if (focusedSurface) {

128+ focusedSurface.focus = true;

129+ }

133130 }

134131 }

135132

@@ -158,6 +155,7 @@ FocusScope {

158155 objectName: "screenshotImage"

159156 anchors.fill: parent

160157 antialiasing: !root.interactive

158+ z: 1

161159

162160 function take() {

163161 // Save memory by using a half-resolution (thus quarter size) screenshot.

@@ -175,6 +173,7 @@ FocusScope {

175173 visible: active

176174 active: false

177175 anchors.fill: parent

176+ z: screenshotImage.z + 1

178177 sourceComponent: Component {

179178 Splash {

180179 id: splash

@@ -191,6 +190,7 @@ FocusScope {

191190

192191 SurfaceContainer {

193192 id: surfaceContainer

193+ z: splashLoader.z + 1

194194 requestedWidth: root.requestedWidth

195195 requestedHeight: root.requestedHeight

196196 surfaceOrientationAngle: application && application.rotatesWindowContents ? root.surfaceOrientationAngle : 0

@@ -208,12 +208,28 @@ FocusScope {

208208 }

209209 }

210210 delegate: SurfaceContainer {

211− interactive: index == (promptSurfacesRepeater.count - 1) && root.interactive

211+ id: promptSurfaceContainer

212+ interactive: index === 0 && root.interactive

212213 surface: model.surface

213214 width: root.width

214215 height: root.height

215216 isPromptSurface: true

217+ z: surfaceContainer.z + (promptSurfacesRepeater.count - index)

218+ property int index: model.index

219+ onIndexChanged: updateFirst()

220+ Component.onCompleted: updateFirst()

221+ function updateFirst() {

222+ if (index === 0) {

223+ promptSurfacesRepeater.first = promptSurfaceContainer;

224+ }

225+ }

226+ }

227+ onCountChanged: {

228+ if (count === 0) {

229+ first = null;

230+ }

216231 }

232+ property Item first: null

217233 }

218234

219235 // SurfaceContainer size drives ApplicationWindow size

tests/mocks/Unity/Application/MirSurfaceListModel.cpp+13−1

@@ -72,6 +72,18 @@ void MirSurfaceListModel::appendSurface(MirSurface *surface)

7272 }

7373}

7474

75+void MirSurfaceListModel::prependSurface(MirSurface *surface)

76+{

77+ beginInsertRows(QModelIndex(), 0, 0);

78+ m_surfaceList.prepend(surface);

79+ connectSurface(surface);

80+ endInsertRows();

81+ Q_EMIT countChanged();

82+ if (m_surfaceList.count() == 1) {

83+ Q_EMIT firstChanged();

84+ }

85+}

86+

7587void MirSurfaceListModel::connectSurface(MirSurface *surface)

7688{

7789 connect(surface, &MirSurface::raiseRequested, this, [this, surface](){ this->raise(surface); });

@@ -143,7 +155,7 @@ MirSurfaceInterface *MirSurfaceListModel::createSurface()

143155 Mir::RestoredState,

144156 screenshotUrl);

145157

146− appendSurface(surface);

158+ prependSurface(surface);

147159

148160 return surface;

149161}

tests/mocks/Unity/Application/MirSurfaceListModel.h+1

@@ -49,6 +49,7 @@ public:

4949 Q_INVOKABLE unity::shell::application::MirSurfaceInterface *createSurface();

5050

5151private:

52+ void prependSurface(MirSurface *surface);

5253 void raise(MirSurface *surface);

5354 void moveSurface(int from, int to);

5455 void connectSurface(MirSurface *surface);

tests/qmltests/Stages/ApplicationCheckBox.qml+1−1

@@ -156,7 +156,7 @@ Column {

156156 width: height

157157 height: promptsLabel.height * 0.7

158158 anchors.verticalCenter: parent.verticalCenter

159− onClicked: d.application.promptSurfaceList.get(d.application.promptSurfaceList.count - 1).close()

159+ onClicked: d.application.promptSurfaceList.get(0).close()

160160 enabled: d.application && d.application.promptSurfaceList.count > 0

161161 Label { text: "➖"; anchors.centerIn: parent; enabled: parent.enabled }

162162 }

tests/qmltests/Stages/tst_ApplicationWindow.qml+1−1

@@ -106,7 +106,7 @@ Rectangle {

106106 enabled: parent.promptSurfaceList !== null && parent.promptSurfaceList.count > 0

107107 activeFocusOnPress: false

108108 text: "Remove"

109− onClicked: { parent.promptSurfaceList.get(parent.promptSurfaceList.count - 1).close(); }

109+ onClicked: { parent.promptSurfaceList.get(0).close(); }

110110 }

111111

112112 Button {