feat: Simplify QT-based tray implementation#121
Conversation
Kishi85
changed the title
Kishi85
changed the title
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #121 +/- ##
===========================================
- Coverage 63.51% 52.54% -10.98%
===========================================
Files 4 3 -1
Lines 858 314 -544
Branches 313 141 -172
===========================================
- Hits 545 165 -380
+ Misses 207 105 -102
+ Partials 106 44 -62
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 3 files with indirect coverage changes Continue to review full report in Codecov by Sentry.
|
Kishi85
force-pushed
the
simplify-qt-tray
branch
11 times, most recently
from
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. |
Kishi85
changed the title
Kishi85
force-pushed
the
simplify-qt-tray
branch
5 times, most recently
from
b747b99 to
26d15e6
Compare
|
Seems that the publish screenshots workflow didn't work. I'll have to look into that. |
|
Looks like I've jinxed it... unit tests don't fail locally but in CI they do it again ... |
|
qt5 passed though, interesting |
ReenigneArcher
force-pushed
the
simplify-qt-tray
branch
from
8338ba4 to
9c1941a
Compare
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
Screenshot ComparisonPR #121 screenshots vs Matrix:
|
| Image | Baseline | PR |
|---|---|---|
tray_icon_initial.png |
 |
 |
tray_icon_svg.png |
 |
 |
tray_icon_themed.png |
 |
 |
tray_menu_checkbox_checked.png |
 |
 |
tray_menu_checkbox_unchecked.png |
 |
 |
tray_menu_left_click.png |
 |
 |
tray_menu_shown.png |
 |
 |
tray_notification_displayed.png |
 |
 |
tray_notification_themed_icon.png |
 |
 |
Matrix: Linux-qt6
| Image | Baseline | PR |
|---|---|---|
tray_icon_initial.png |
 |
 |
tray_icon_svg.png |
 |
 |
tray_icon_themed.png |
 |
 |
tray_menu_checkbox_checked.png |
 |
 |
tray_menu_checkbox_unchecked.png |
 |
 |
tray_menu_left_click.png |
 |
 |
tray_menu_shown.png |
 |
 |
tray_notification_displayed.png |
 |
 |
tray_notification_themed_icon.png |
 |
 |
Matrix: Windows
| Image | Baseline | PR |
|---|---|---|
tray_icon_initial.png |
 |
|
tray_menu_checkbox_checked.png |
 |
|
tray_menu_checkbox_unchecked.png |
 |
|
tray_menu_shown.png |
 |
|
tray_notification_displayed.png |
 |
Matrix: macOS
| Image | Baseline | PR |
|---|---|---|
tray_icon_initial.png |
 |
|
tray_menu_checkbox_checked.png |
 |
|
tray_menu_checkbox_unchecked.png |
 |
|
tray_menu_shown.png |
 |
|
tray_notification_displayed.png |
 |
|
Nice, past the failures now! I do see a few issues from the screenshots though.
|
|
|
I've noted a few discrepancies during basic testing but I wasn't sure if that was just my setup. I'll have a look at those issues and they should be easily fixable. Putting this back to drafting until I've squashed those bugs. |
2 participants
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