git.iko.soy/unity8
on xenial help sign in
fix tap test
e06d21fLukáš Tinkl
qml/Stages/ApplicationWindow.qml+2−2
compare with xenial
unifiedsplit
@@ -54,7 +54,7 @@ FocusScope {
54 // Whether the Application had a surface before but lost it.
54 // Whether the Application had a surface before but lost it.
55 property bool hadSurface: sessionContainer.surfaceContainer.hadSurface
55 property bool hadSurface: sessionContainer.surfaceContainer.hadSurface
56
56
57− property bool needToTakeScreenshot:
57+ readonly property bool needToTakeScreenshot:
58 ((sessionContainer.surface && d.surfaceInitialized) || d.hadSurface)
58 ((sessionContainer.surface && d.surfaceInitialized) || d.hadSurface)
59 && screenshotImage.status === Image.Null
59 && screenshotImage.status === Image.Null
60 && d.applicationState === ApplicationInfoInterface.Stopped
60 && d.applicationState === ApplicationInfoInterface.Stopped
@@ -69,7 +69,7 @@ FocusScope {
69 // Remove this when possible
69 // Remove this when possible
70 property bool surfaceInitialized: false
70 property bool surfaceInitialized: false
71
71
72− property bool supportsSurfaceResize:
72+ readonly property bool supportsSurfaceResize:
73 application &&
73 application &&
74 ((application.supportedOrientations & Qt.PortraitOrientation)
74 ((application.supportedOrientations & Qt.PortraitOrientation)
75 || (application.supportedOrientations & Qt.InvertedPortraitOrientation))
75 || (application.supportedOrientations & Qt.InvertedPortraitOrientation))
qml/Stages/WindowDecoration.qml+1
@@ -32,6 +32,7 @@ MouseArea {
32 signal minimize()
32 signal minimize()
33 signal maximize()
33 signal maximize()
34
34
35+ acceptedButtons: Qt.LeftButton
35 onDoubleClicked: root.maximize()
36 onDoubleClicked: root.maximize()
36
37
37 QtObject {
38 QtObject {
tests/qmltests/Stages/tst_DesktopStage.qml+8−4
@@ -149,7 +149,7 @@ Item {
149 function test_tappingOnWindowChangesFocusedApp_data() {
149 function test_tappingOnWindowChangesFocusedApp_data() {
150 return [
150 return [
151 {tag: "dash to dialer", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 0, focusTo: 1 },
151 {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 }
153 ]
153 ]
154 }
154 }
155
155
@@ -196,7 +196,7 @@ Item {
196 function test_tappingOnDecorationFocusesApplication_data() {
196 function test_tappingOnDecorationFocusesApplication_data() {
197 return [
197 return [
198 {tag: "dash to dialer", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 0, focusTo: 1 },
198 {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 }
200 ]
200 ]
201 }
201 }
202
202
@@ -206,12 +206,16 @@ Item {
206 var fromAppDecoration = findChild(desktopStage, "appWindowDecoration_" + data.apps[data.focusfrom]);
206 var fromAppDecoration = findChild(desktopStage, "appWindowDecoration_" + data.apps[data.focusfrom]);
207 verify(fromAppDecoration);
207 verify(fromAppDecoration);
208 tap(fromAppDecoration);
208 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);
210
212
211 var toAppDecoration = findChild(desktopStage, "appWindowDecoration_" + data.apps[data.focusTo]);
213 var toAppDecoration = findChild(desktopStage, "appWindowDecoration_" + data.apps[data.focusTo]);
212 verify(toAppDecoration);
214 verify(toAppDecoration);
213 tap(toAppDecoration);
215 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);
215 }
219 }
216
220
217 function test_clickingOnDecorationFocusesApplication_data() {
221 function test_clickingOnDecorationFocusesApplication_data() {