Handle active call hint correctly when greeter is shown
commite4d1bfc3496e60c89b5bc6a118b7a1c8544bfd0b
authorMichael Terry <michael.terry@canonical.com>
dateWed 8 Oct 2014, 17:05 (12 years ago)
parent7ce9bee
qml/Panel/ActiveCallHint.qml+3−1
@@ -23,6 +23,8 @@ import "../Components"
2323Item {
2424 id: callHint
2525
26+ property bool greeterShown: false
27+
2628 readonly property bool active: {
2729 var application = ApplicationManager.findApplication("dialer-app");
2830
@@ -33,7 +35,7 @@ Item {
3335 return application.state !== ApplicationInfoInterface.Starting;
3436 }
3537 }
36− if (ApplicationManager.focusedApplicationId !== "dialer-app") {
38+ if (greeterShown || ApplicationManager.focusedApplicationId !== "dialer-app") {
3739 if (application) {
3840 // Don't show if application is still starting; might get a fleeting true/false.
3941 return application.state !== ApplicationInfoInterface.Starting && callManager.hasCalls;
qml/Shell.qml+3
@@ -640,6 +640,9 @@ Item {
640640 width: parent.width > units.gu(60) ? units.gu(40) : parent.width
641641 panelHeight: units.gu(3)
642642 }
643+ callHint {
644+ greeterShown: greeter.shown || lockscreen.shown
645+ }
643646
644647 property bool topmostApplicationIsFullscreen:
645648 ApplicationManager.focusedApplicationId &&