git.iko.soy/unity8
on xenial help sign in
fix tap test
commite06d21faab6506d8f4f7995b295611f98a12ff59 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 5 Nov 2015, 03:05 (11 years ago) parent886ad27
3 files changed+11−6
compare with xenial
unifiedsplit
qml/Stages/ApplicationWindow.qml+2−2 qml/Stages/WindowDecoration.qml+1 tests/qmltests/Stages/tst_DesktopStage.qml+8−4
qml/Stages/ApplicationWindow.qml+2−2
@@ -54,7 +54,7 @@ FocusScope {
5454 // Whether the Application had a surface before but lost it.
5555 property bool hadSurface: sessionContainer.surfaceContainer.hadSurface
5656
57− property bool needToTakeScreenshot:
57+ readonly property bool needToTakeScreenshot:
5858 ((sessionContainer.surface && d.surfaceInitialized) || d.hadSurface)
5959 && screenshotImage.status === Image.Null
6060 && d.applicationState === ApplicationInfoInterface.Stopped
@@ -69,7 +69,7 @@ FocusScope {
6969 // Remove this when possible
7070 property bool surfaceInitialized: false
7171
72− property bool supportsSurfaceResize:
72+ readonly property bool supportsSurfaceResize:
7373 application &&
7474 ((application.supportedOrientations & Qt.PortraitOrientation)
7575 || (application.supportedOrientations & Qt.InvertedPortraitOrientation))
qml/Stages/WindowDecoration.qml+1
@@ -32,6 +32,7 @@ MouseArea {
3232 signal minimize()
3333 signal maximize()
3434
35+ acceptedButtons: Qt.LeftButton
3536 onDoubleClicked: root.maximize()
3637
3738 QtObject {
tests/qmltests/Stages/tst_DesktopStage.qml+8−4
@@ -149,7 +149,7 @@ Item {
149149 function test_tappingOnWindowChangesFocusedApp_data() {
150150 return [
151151 {tag: "dash to dialer", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 0, focusTo: 1 },
152− {tag: "dialer to dash", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 1, focusTo: 0 },
152+ {tag: "dialer to dash", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 1, focusTo: 0 }
153153 ]
154154 }
155155
@@ -196,7 +196,7 @@ Item {
196196 function test_tappingOnDecorationFocusesApplication_data() {
197197 return [
198198 {tag: "dash to dialer", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 0, focusTo: 1 },
199− {tag: "dialer to dash", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 1, focusTo: 0 },
199+ {tag: "dialer to dash", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 1, focusTo: 0 }
200200 ]
201201 }
202202
@@ -206,12 +206,16 @@ Item {
206206 var fromAppDecoration = findChild(desktopStage, "appWindowDecoration_" + data.apps[data.focusfrom]);
207207 verify(fromAppDecoration);
208208 tap(fromAppDecoration);
209− tryCompare(ApplicationManager.findApplication(data.apps[data.focusfrom]).session.surface, "activeFocus", true);
209+ var fromApp = ApplicationManager.findApplication(data.apps[data.focusfrom]);
210+ verify(fromApp);
211+ tryCompare(fromApp.session.surface, "activeFocus", true);
210212
211213 var toAppDecoration = findChild(desktopStage, "appWindowDecoration_" + data.apps[data.focusTo]);
212214 verify(toAppDecoration);
213215 tap(toAppDecoration);
214− tryCompare(ApplicationManager.findApplication(data.apps[data.focusTo]).session.surface, "activeFocus", true);
216+ var toApp = ApplicationManager.findApplication(data.apps[data.focusTo]);
217+ verify(toApp);
218+ tryCompare(toApp.session.surface, "activeFocus", true);
215219 }
216220
217221 function test_clickingOnDecorationFocusesApplication_data() {