Skip to content

feat: Simplify QT-based tray implementaion#121

Draft
Kishi85 wants to merge 13 commits into
LizardByte:masterfrom
Kishi85:simplify-qt-tray
Draft

feat: Simplify QT-based tray implementaion#121
Kishi85 wants to merge 13 commits into
LizardByte:masterfrom
Kishi85:simplify-qt-tray

Conversation

@Kishi85
Copy link
Copy Markdown

@Kishi85 Kishi85 commented May 8, 2026

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

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

@Kishi85 Kishi85 changed the title Simplify QT-based tray implementaion fix: Simplify QT-based tray implementaion May 8, 2026
@Kishi85 Kishi85 changed the title fix: Simplify QT-based tray implementaion feat: Simplify QT-based tray implementaion May 8, 2026
@codecov
Copy link
Copy Markdown

codecov Bot commented May 9, 2026

Codecov Report

❌ Patch coverage is 0% with 196 lines in your changes missing coverage. Please review.
✅ Project coverage is 41.00%. Comparing base (9189980) to head (c552bda).
✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
src/QtTrayMenu.cpp 0.00% 161 Missing and 1 partial ⚠️
src/tray_linux.cpp 0.00% 34 Missing ⚠️

❗ There is a different number of reports uploaded between BASE (9189980) and HEAD (c552bda). Click for more details.

HEAD has 2 uploads less than BASE
Flag BASE (9189980) HEAD (c552bda)
Linux-qt5 1 0
Linux-qt6 1 0
Additional details and impacted files

Impacted file tree graph

@@             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     
Flag Coverage Δ
Linux-qt5 ?
Linux-qt6 ?
Windows 70.67% <ø> (ø)
macOS 57.52% <ø> (-1.77%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
src/tray_linux.cpp 0.00% <0.00%> (-59.47%) ⬇️
src/QtTrayMenu.cpp 0.00% <0.00%> (ø)

... and 1 file with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9189980...c552bda. Read the comment docs.

@Kishi85 Kishi85 force-pushed the simplify-qt-tray branch 11 times, most recently from 275be0f to c552bda Compare May 11, 2026 11:31
@Kishi85
Copy link
Copy Markdown
Author

Kishi85 commented May 11, 2026

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:

[ RUN      ] TrayTest.TestCheckboxStates
/home/runner/work/_temp/d5b937f4-9556-4df2-8f27-571e2cb10ca8.sh: line 1:  8581 Segmentation fault      (core dumped) ./test_tray --gtest_color=yes --gtest_output=xml:test_results.xml
Error: Process completed with exit code 139.

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.

@ReenigneArcher
Copy link
Copy Markdown
Member

@Kishi85 have a look at #123

Comment thread src/QtTrayMenu.cpp Outdated
// 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};
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

tray/src/tray_linux.cpp

Lines 544 to 573 in 2a638a8

void configure_app_metadata(const struct tray *tray) {
const QString effective_name = !g_app_name.isEmpty() ? g_app_name : QStringLiteral("tray");
if (QCoreApplication::applicationName().isEmpty()) {
QCoreApplication::setApplicationName(effective_name);
}
if (QGuiApplication::applicationDisplayName().isEmpty()) {
if (!g_app_display_name.isEmpty()) {
QGuiApplication::setApplicationDisplayName(g_app_display_name);
} else {
const QString display_name =
(tray != nullptr && tray->tooltip != nullptr) ? QString::fromUtf8(tray->tooltip) : effective_name;
QGuiApplication::setApplicationDisplayName(display_name);
}
}
if (!QGuiApplication::desktopFileName().isEmpty()) {
return;
}
if (!g_desktop_name.isEmpty()) {
QGuiApplication::setDesktopFileName(g_desktop_name);
return;
}
QString desktop_name = QCoreApplication::applicationName();
if (!desktop_name.endsWith(QStringLiteral(".desktop"))) {
desktop_name += QStringLiteral(".desktop");
}
QGuiApplication::setDesktopFileName(desktop_name);

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment thread src/tray_linux.cpp
}
}

void destroy_app() {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That part I've also taken over and put in QtTrayMenu::exit()

@Kishi85
Copy link
Copy Markdown
Author

Kishi85 commented May 12, 2026

@Kishi85 have a look at #123

I'll pick that test change if you dont mind as it IMHO makes more sense logically

Kishi85 and others added 10 commits May 12, 2026 08:04
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.
@Kishi85
Copy link
Copy Markdown
Author

Kishi85 commented May 12, 2026

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:
qt.qpa.wayland: Failed to create grabbing popup. Ensure popup QWidgetWindow(0x55c3cc28b8c0, name="QMenuClassWindow") has a transientParent set and that parent window has received input.

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.

@Kishi85 Kishi85 force-pushed the simplify-qt-tray branch from c552bda to 329b911 Compare May 12, 2026 06:18
@sonarqubecloud
Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants