git.iko.soy/unity8
on xenial help sign in
fix tests after merging trunk
e4b1d1eMichael Zanetti
qml/Stages/DesktopStage.qml+5
compare with xenial
unifiedsplit
@@ -192,6 +192,11 @@ Rectangle {
192 ApplicationManager.requestFocusApplication(model.appId);
192 ApplicationManager.requestFocusApplication(model.appId);
193 }
193 }
194 }
194 }
195+ Component.onCompleted: {
196+ if (ApplicationManager.focusedApplicationId == model.appId) {
197+ decoratedWindow.forceActiveFocus();
198+ }
199+ }
195
200
196 states: [
201 states: [
197 State {
202 State {
tests/qmltests/tst_Shell.qml+2−1
@@ -782,7 +782,8 @@ Rectangle {
782
782
783 // check that the desktop stage and window have been loaded
783 // check that the desktop stage and window have been loaded
784 {
784 {
785− var desktopWindow = findChild(shell, "decoratedWindow_webbrowser-app");
785+ var desktopWindow = findChild(shell, "appWindow_webbrowser-app");
786+ print("have desktopWindow", desktopWindow)
786 verify(desktopWindow);
787 verify(desktopWindow);
787 }
788 }
788
789