← Back to branch summary

~unity-team/unity8/fake-dash-for-prototyping

« back to all changes in this revision

Viewing changes to qml/Stages/ApplicationWindow.qml

  • Committer: CI bot
  • Author(s): Nick Dedekind
  • Date: 2014-09-08 14:11:13 UTC
  • mfrom: (1134.1.52 unity8)
  • Revision ID: ps-jenkins@lists.canonical.com-20140908141113-gj9hieb0t0crdo4o
Support for nested prompt session. Fixes: 1358388, 1363081
Approved by: Michał Sawicz, Daniel d'Andrada

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Stages/ApplicationWindow.qml
55
55
        property bool surfaceInitialized: false
56
56
 
57
57
        function forceSurfaceActiveFocusIfReady() {
58
 
            if (sessionContainer.surface.focus &&
 
58
            if (sessionContainer.surface !== null &&
 
59
                    sessionContainer.surface.focus &&
59
60
                    sessionContainer.surface.parent === sessionContainer.surfaceContainer &&
60
61
                    sessionContainer.surface.enabled) {
61
62
                sessionContainer.surface.forceActiveFocus();
114
115
        onSurfaceChanged: {
115
116
            if (sessionContainer.surface) {
116
117
                surfaceInitTimer.start();
 
118
                d.forceSurfaceActiveFocusIfReady();
117
119
            } else {
118
120
                d.surfaceInitialized = false;
119
121
            }
120
 
            d.forceSurfaceActiveFocusIfReady();
121
122
        }
122
123
    }
123
124