[applets/systemtray] Show base icon when AttentionIcon not set
ClosedPublic

Authored by kmaterka on May 8 2020, 9:10 PM.

Details

Summary

If status is set to NeedsAttention it tries to use Attention Icon. If Attention Icon is not set, empty/null QIcon is set. QML can't check if QIcon is null or not, as a result it tries to use empty icon and nothing is rendered.
Set null QVariant if AttentionIcon is not valid so that QML check will work correctly.

Test Plan
  • Set NeedsAttention as a status and with no Attention Icon
  • Base Icon should render correctly

Diff Detail

Repository
R120 Plasma Workspace
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
kmaterka created this revision.May 8 2020, 9:10 PM
Restricted Application added a project: Plasma. · View Herald TranscriptMay 8 2020, 9:10 PM
Restricted Application added a subscriber: plasma-devel. · View Herald Transcript
kmaterka requested review of this revision.May 8 2020, 9:10 PM

Firstly, AttentionIcon support was introduced in D24865. It had a bug, fixed for 5.18 in D29386. When I merged branch 5.18 (with D29386) into master, by mistake I forgot about AttentionIcon handling... This change fixes the incomplete merge.

kmaterka added a comment.EditedMay 11 2020, 11:44 AM

Can we have it reviewed before beta 5.19 release?

mart accepted this revision.May 11 2020, 4:02 PM
This revision is now accepted and ready to land.May 11 2020, 4:02 PM
This revision was automatically updated to reflect the committed changes.