feat: Cleanup Qt-based tray implementation#121
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #121 +/- ##
==========================================
+ Coverage 63.75% 64.38% +0.63%
==========================================
Files 4 5 +1
Lines 858 643 -215
Branches 313 209 -104
==========================================
- Hits 547 414 -133
+ Misses 205 153 -52
+ Partials 106 76 -30
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 1 file with indirect coverage changes Continue to review full report in Codecov by Sentry.
|
275be0f to
c552bda
Compare
|
I've fixed most of the issues I've found so far (added all the necessary pointer valid checks/etc. and moved the exit() order around so everything gets cleaned up in reverse order (clearing references as necessary on the go). But no matter what I do the CI pipeline segfaults at this one specific test: I can run all the tests fine locally after I've added support for spectacle screenshots due to using KDE, tests running both with clang and gcc compiled project. It just wont complete when run on the CI-container with ubuntu-latest. I'm a bit out of ideas here and it looks like I have to test this on a native Ubuntu-latest install at some point to continue this further. |
|
Also the change you did for showing the menu on wayland in #123 does not work. Same issue as with show() due to that bug in Qt: Looks like the only way to get left-click to work on Linux/Wayland is for Qt to fix the bug, every other workaround either fails silently or yields above message unfortunately. |
|
One main deficit of the QSystemTray::showMessage notification is that it does not hide immediately when you click it even if it triggers the callback. Neither can you programmatically close the message via the trayIcon object hence the screenshots showing multiple balloons due to tests firing in rapid succession. After looking around for a bit the best thing (in terms of interoperability and functionality) seems to be using libnotify just for the notifications (as the XDG desktop notification path is not really viable due to the process privilege constraints). Good thing here is that now that most of the Qt Tray Menu stuff is now isolated, it should be easy to do something similar for notifications and have a clean implementation. |
b747b99 to
26d15e6
Compare
This comment was marked as resolved.
This comment was marked as resolved.
Add a persistent default argv (anonymous namespace) and include QCursor, then construct QApplication with the default argv when original argc/argv are missing to avoid using a short-lived stack array. Hide trayTopMenu before clearing tray references to prevent lingering UI. Replace menu->show() with menu->popup(QCursor::pos()) to work around QTBUG-139921 on Linux/Wayland. NOSONAR comments for QApplication allocation are preserved.
…sic QtTrayIcon::showMessage()
…back where necessary
…cation in notify()
Unless the operation is done during init, loop or already emitting a signal to do the modification.
…messages on system tray
… to avoid deadlocking
35c353d to
5f5e43d
Compare
|
|
Unless you want me to wait, I think I'm good with merging this as is. I don't think anyone is going to test it out on Sunshine until it's merged into the pre-releases. |
Go for it. If there's anything to add I'll do a follow up PR. |
|
@ReenigneArcher |
|
@Kishi85 so with these changes, do you think it could pave the way to use QT on Windows and macOS as well? |
The QtTrayMenu class should work on any QT supported platform. The only thing that likely needs attention per platform is notifications due to already noted restrictions of QSystemTrayIcon::showMessage. |



Description
This reworks the Qt-based tray with an adapted version of QtTrayMenu.h/cpp from upstream as suggested in LizardByte/Sunshine#4907.
This version restores libnotify for notifications due to potential problems caused by DBus interface limitations when running with elevated privileges (e.g. as used by Sunshine). The new libnotify integration also tries to separate the used codepaths as best as possible to keep the implementation clean and easily understandable (with a fallback to basic notifications using QtTrayMenu::showMessage).
There is still an issue with left clicking the tray icon on Wayland (also present in the current AI based implementation) which caused by https://qt-project.atlassian.net/browse/QTBUG-139921 that can unfortunately not be worked around.
This version is platform-neutral for QtTrayMenu.h/cpp code with Linux platform-specific parts (and libnotify integration) restricted to tray_linux.cpp. Qt-provided features are used as much as possible to keep this platform-independent.
Screenshot
Issues Fixed or Closed
Roadmap Issues
Type of Change
Checklist
AI Usage