feat: Simplify QT-based tray implementaion#121
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #121 +/- ##
===========================================
- Coverage 63.75% 41.00% -22.75%
===========================================
Files 4 5 +1
Lines 858 517 -341
Branches 313 148 -165
===========================================
- Hits 547 212 -335
- Misses 205 281 +76
+ Partials 106 24 -82
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. |
| // We might not have access to the real argc/argv here due to being called/pulled as a dependency. | ||
| if (argc < 0 && argv == nullptr) { | ||
| argc = 1; | ||
| char *argvArray[] = {(char *) "TrayMenuApp", nullptr}; |
There was a problem hiding this comment.
This was one of the things I didn't like about the upstream version. We need to be able to set the metadata ourselves, like
Lines 544 to 573 in 2a638a8
There was a problem hiding this comment.
That is one of the things I've taken over from your version. The constructor is just there to have it initialize without throwing an empty key error.
| } | ||
| } | ||
|
|
||
| void destroy_app() { |
There was a problem hiding this comment.
I believe this was needed for tests. You can look at the screenshots in the PR I mentioned and see that there is no longer proper cleanup between tests.
There was a problem hiding this comment.
That part I've also taken over and put in QtTrayMenu::exit()
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.
|
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. |
|



Description
This reworks the Qt-based tray with an adapted version of QtTrayMenu.h/cpp from upstream as suggested in LizardByte/Sunshine#4907.
This currently a very early work-in-progress version of the code with all of Lizardbyte's forks additional functionality (e.g. notifications) implemented but tested only very limited.
There is also still an issue with left clicking the tray icon that is also present in the current AI based implementation which caused by https://qt-project.atlassian.net/browse/QTBUG-139921.
This version is platform-neutral for QtTrayMenu.h/cpp code with Linux platform-specifics restricted to tray_linux.cpp. Special features like XDG desktop notifications (which wouldn't have worked with Sunshine anyway due to elevated privileges) have been replaced with Qt-native equivalents. Positioning is currently also fully reliant on Qt-provided features to maintain platform independence.
Screenshot
Issues Fixed or Closed
Roadmap Issues
Type of Change
Checklist
AI Usage