fix(macOS): hide dock icon when closing settings with ⌘+W#9702
Merged
Conversation
i2h3
added
os: 🍎 macOS
github-project-automation
bot
moved this to 🧭 Planning evaluation (don't pick)
in 💻 Desktop Clients team
Collaborator
Author
|
/backport to stable-33.0 |
The ⌘+W shortcut was connected to QDialog::accept(), which internally calls hide() and emits QEvent::Hide. The ForegroundBackground event filter only listens for QEvent::Close, so the dock icon remained visible. Clicking the window's close button works correctly because it sends QEvent::Close directly. Connecting the shortcut to close() instead of accept() ensures QEvent::Close is sent, making ⌘+W behave identically to the close button: the event filter fires, ToBackground() is called, and the dock icon disappears. Signed-off-by: Iva Horn <iva.horn@nextcloud.com>
i2h3
force-pushed
the
i2h3/fix/9328-dock-disappearance
branch
from
1a65d8a to
30b7fbf
Compare
|
Artifact containing the AppImage: nextcloud-appimage-pr-9702.zip Digest: To test this change/fix you can download the above artifact file, unzip it, and run it. Please make sure to quit your existing Nextcloud app and backup your data. |
github-project-automation
bot
moved this from 🧭 Planning evaluation (don't pick)
to ☑️ Done
in 💻 Desktop Clients team
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #9328
When the settings window is closed by clicking the window's close button, the macOS dock icon
disappears as expected. However, closing the window with ⌘+W left the dock icon visible.
Root cause
The
ForegroundBackgroundevent filter (foregroundbackground_mac.mm) listens forQEvent::Closeto call
ToBackground(), which hides the dock icon.QEvent::Close→ event filter fires → dock icon hides.SettingsDialog::accept(), which callsQDialog::done()→hide()→ emitsQEvent::Hide, notQEvent::Close. The event filter never fires.Fix
Connect the ⌘+W shortcut to
close()instead ofaccept().QWidget::close()sends aQEvent::Close, which:ForegroundBackgroundevent filter → hides the dock iconSettingsDialog::reject()(QDialog's default close behavior) → saves window geometryWA_DeleteOnCloseThis matches the close button's behavior exactly.