Skip to content

fix: Use Flatpak app ID for X11/Wayland window association if available - #531

Merged
DirkDoes merged 1 commit into
mainfrom
fix/flatpak-app-id-icons
Oct 14, 2026
Merged

DirkDoes merged 1 commit into
mainfrom
fix/flatpak-app-id-icons

Conversation

@matellush

@matellush matellush commented Oct 14, 2026 •

Copy link
Copy Markdown
Collaborator

Purpose of this PR:

Provide a fix for #469 (Wheel Wizard's taskbar icon not being displayed under Wayland when using the Flatpak).

How to Test:

Check out the latest Wayland-related PR in the Wheel Wizard Flathub repository, build and test the Flatpak under Wayland. The taskbar icon should be properly displayed with this change.

What Has Been Changed:

The Flatpak .desktop files' StartupWMClass values were updated to consistently use the Flatpak app ID (io.github.TeamWheelWizard.WheelWizard) rather than the default WheelWizard-internal assembly name WheelWizard.
The Avalonia packages were updated to 12.1.4, which allows specifying the Wayland AppId. We now override the default assembly name used in either WmClass or AppId if running as a Flatpak in both the X11 and Wayland platform options.

Related Issue Link:

#469

Checklist before merging

  • You have created relevant tests

Summary by CodeRabbit

  • Bug Fixes
    • Improved Linux desktop integration by aligning the application’s window identity with its Flatpak app ID when running in Flatpak. This helps desktop environments correctly associate the app window with its launcher.
    • Preserved default window identity settings outside Flatpak, while retaining Wayland-specific startup behavior.

@coderabbitai

coderabbitai Bot commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

Review in Change Stack →

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration
  • Configuration used: Organization UI
  • Review profile: ASSERTIVE
  • Plan: Advanced
  • Run ID: 326446cd-d683-4104-a55c-dd9679d84d49
📥 Commits

Reviewing files that changed from the base of the PR and between 14c0c7c and 5532a0c.

📒 Files selected for processing: 4
  • Flatpak/io.github.TeamWheelWizard.WheelWizard-url-handler.desktop
  • Flatpak/io.github.TeamWheelWizard.WheelWizard.desktop
  • WheelWizard/Program.cs
  • WheelWizard/WheelWizard.csproj

Included review availability: This review used your included allowance. Your plan provides up to 4 included reviews per hour; 3 remain after this review.

📝 Walkthrough

The desktop entries now use the Flatpak app ID as their startup window class. On Linux, the app applies FLATPAK_ID to X11 and Wayland options when available. Five Avalonia packages are updated from version 12.1.2 to 12.1.4.

Changes: Flatpak Window Identity

Layer / File(s) Summary
Apply the Flatpak app ID
Flatpak/*.desktop, WheelWizard/Program.cs
Both desktop entries set StartupWMClass to io.github.TeamWheelWizard.WheelWizard. The app reads FLATPAK_ID only in Flatpak and applies it to X11 and Wayland options when available. Otherwise, it retains the existing defaults.
Update Avalonia packages
WheelWizard/WheelWizard.csproj
Five Avalonia package references change from version 12.1.2 to 12.1.4.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Bug fix

Suggested reviewers: dirkdoes

Merge Risk: ⚪ Minimal · up to 5532a

The Flatpak window identity is consistent across the desktop entries and runtime configuration. No actionable merge-blocking risk is established.

Pre-merge checks: Passed 5
Passed Passed checks: 5 passed
Check name Status Explanation
Description check Passed The description includes all required sections. It explains the Wayland taskbar icon fix, testing steps, changed files and behavior, related issue #469, and the unchecked test checklist.
Title check Passed The title is concise and accurately describes the main change: using the Flatpak app ID for X11 and Wayland window association.
Docstring Coverage Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 1 files. (3 skipped: 3 …
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

A rabbit checks the window name,
Then sets the app ID just the same.
The desktop entries match the view,
Avalonia packages update too.
One hop, one change, all neat and clear.

Comment @coderabbitai help to get the list of available commands.

@DirkDoes DirkDoes left a comment

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.

Thanks for the fix

@DirkDoes
DirkDoes merged commit 5520bd3 into main Oct 14, 2026
3 checks passed
@DirkDoes
DirkDoes deleted the fix/flatpak-app-id-icons branch October 14, 2026 18:15
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