Merge lp:~josharenson/unity8/fix_tps_active into lp:unity8

[Josh Arenson]

Don't force a surface to lose focus when its parent is updated.

This workarround prevents the closure of a trusted prompt session from causing the underlying surface to lose focus and then gain it right back. This brief loss of focus causes Qt.application.active to momentarily be set to 'false'. Currently, this is just a workarround and hopefuly by still setting focus to 'true' after the surface is added to the scene, active focus will still be updated correctly.

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

Don't force a surface to lose focus when its parent is updated.

This workarround prevents the closure of a trusted prompt session from causing the underlying surface to lose focus and then gain it right back. This brief loss of focus causes Qt.application.active to momentarily be set to 'false'. Currently, this is just a workarround and hopefuly by still setting focus to 'true' after the surface is added to the scene, active focus will still be updated correctly.

Unmerged revisions

1909. By Josh Arenson on 2015-08-18

Don't force a surface to lose focus when its parent is updated.

This workarround prevents the closure of a trusted prompt session from causing the underlying surface to lose focus and then gain it right back. This brief loss of focus causes Qt.application.active to momentarily be set to 'false'. Currently, this is just a workarround and hopefuly by still setting focus to 'true' after the surface is added to the scene, active focus will still be updated correctly.

1908. By Josh Arenson on 2015-08-18

* Drop gcc 4.9 requirement in debian/rules
* Make the test more stable
* Optimize scope.preview() calls (LP: #1478022)
[ Alberto Mardegan ]
* Set currentIndex after the model change is completed (LP: #1433442)
[ Albert Astals Cid ]
* Make the test pass again after rework of appmanager
* fix testPhoneStage
[ Daniel d'Andrada ]
* Fix and clean up InputInfo plugin
[ Rodney Dawes ]
* Do not call verify in the payments button code. (LP: #1468038)
[ Albert Astals Cid ]
* Add a test that checks that items in an expandable are the correct
  size after expanding the expandable
* Fix the expandable test
* Replace some waitForRendering with wait(0)
* Workaround for bug 1473471 (LP: #1473471)
[ Gary.Wzl ]
* Fix layout issue when adding audio track widget in expandable widget
[ handsome_feng ]
* Added indication for running apps. (LP: #1471577)
* Adjust the color to highlighting indicator. (LP: #1457098)
* Convert the MouseArea to MultiPointTouchArea to track multiple touch
  points. (LP: #1445472)
[ handsome_feng<email address hidden> ]
* Convert the MouseArea to MultiPointTouchArea to track multiple touch
  points. (LP: #1445472)

=== modified file 'qml/Stages/SurfaceContainer.qml'
--- qml/Stages/SurfaceContainer.qml	2015-04-15 11:37:00 +0000
+++ qml/Stages/SurfaceContainer.qml	2015-08-18 20:00:48 +0000
@@ -31,7 +31,7 @@
         if (surface) {
             // Set the surface focus *after* it is added to the scene to
             // ensure an update to the scene's active focus.
-            surface.focus = false;
+            // surface.focus = false;
             surface.parent = root;
             surface.focus = true;
         } else {