e4d1bfc · unity8 · git.iko.soy

on xenial help sign in

Handle active call hint correctly when greeter is shown

e4d1bfcMichael Terry12 years ago

qml/Panel/ActiveCallHint.qml+3−1

@@ -23,6 +23,8 @@ import "../Components"

23Item {

24 id: callHint

26+ property bool greeterShown: false

27+

26 readonly property bool active: {

28 readonly property bool active: {

27 var application = ApplicationManager.findApplication("dialer-app");

29 var application = ApplicationManager.findApplication("dialer-app");

@@ -33,7 +35,7 @@ Item {

33 return application.state !== ApplicationInfoInterface.Starting;

35 return application.state !== ApplicationInfoInterface.Starting;

34 }

36 }

35 }

37 }

36− if (ApplicationManager.focusedApplicationId !== "dialer-app") {

38+ if (greeterShown || ApplicationManager.focusedApplicationId !== "dialer-app") {

37 if (application) {

39 if (application) {

38 // Don't show if application is still starting; might get a fleeting true/false.

40 // Don't show if application is still starting; might get a fleeting true/false.

39 return application.state !== ApplicationInfoInterface.Starting && callManager.hasCalls;

41 return application.state !== ApplicationInfoInterface.Starting && callManager.hasCalls;

qml/Shell.qml+3

@@ -640,6 +640,9 @@ Item {

640 width: parent.width > units.gu(60) ? units.gu(40) : parent.width

641 panelHeight: units.gu(3)

642 }

643+ callHint {

644+ greeterShown: greeter.shown || lockscreen.shown

645+ }

643

646

644 property bool topmostApplicationIsFullscreen:

647 property bool topmostApplicationIsFullscreen:

645 ApplicationManager.focusedApplicationId &&

648 ApplicationManager.focusedApplicationId &&