https://bugs.kde.org/show_bug.cgi?id=430226

Weixuan XIAO <veyx.s...@gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
      Latest Commit|                            |https://invent.kde.org/netw
                   |                            |ork/kdeconnect-kde/commit/5
                   |                            |31418c7d2728d44175cb8e5be3b
                   |                            |1c5925447899
             Status|REPORTED                    |RESOLVED
         Resolution|---                         |FIXED

--- Comment #2 from Weixuan XIAO <veyx.s...@gmail.com> ---
Git commit 531418c7d2728d44175cb8e5be3b1c5925447899 by Weixuan Xiao, on behalf
of Ryan Adolf.
Committed on 02/03/2022 at 12:06.
Pushed by wxiao into branch 'master'.

Change tray icon so it is the right color on MacOS

## Summary

On MacOS the system tray icon is off-color because it uses the gray-colored
`kdeconnectindicatordark` icon which does not match the rest of MacOS.

![image](/uploads/430933399d9570dc1c59807e4715e87b/image.png)

I've used two patches to fix this:
1. Always use the status `KStatusNotifierItem::Passive` on MacOS.
`KStatusNotifierItem` will only mark the icon as a mask (which is needed to
allow it to dynamically switch between light and dark theme) [if the status is
passive](https://invent.kde.org/frameworks/knotifications/-/blob/cff7c337ab9a78708ac5594badb54e8f88f61a8d/src/kstatusnotifieritem.cpp#L1079-1081).
2. The above should theoretically be enough to fix the issue and I swear at one
point it was all that was needed. However, to fix this issue in my dev
environment I also needed to pass in a `QIcon` with `setIsMask(true)` instead
of setting the icon by its name. And I also use the `kdeconnectindicator`
instead of `kdeconnectindicatordark` icon.

## Test Plan

The icon now renders in the correct color, regardless of whether devices are
connected:

![image](/uploads/5010a07cbb5f23a286ece641c6b3879c/image.png)
![image](/uploads/2ae5d3d8aa633ebafb260febe313057c/image.png)

## Future work

Once I've verified this PR is working in the right direction, I want to look
into making the icon gray (and hopefully a much easier-to-see gray) when no
devices are connected!

For example, WireGuard, when not connected, looks like this:

![image](/uploads/43c2ef6bc7261431e878c9c1c05174f9/image.png)
![image](/uploads/f7587190648606df77ad3e3dde84098f/image.png)

P.S. I've been testing off the v21.12.2 tag since the master branch doesn't
compile for me, so I haven't tested this change on the latest dev commit. But
there should be no conflicts.

M  +3    -1    indicator/indicatorhelper_mac.cpp
M  +2    -0    indicator/main.cpp

https://invent.kde.org/network/kdeconnect-kde/commit/531418c7d2728d44175cb8e5be3b1c5925447899

-- 
You are receiving this mail because:
You are watching all bug changes.

Reply via email to