Handle Command-W to close key window or ruler#162
Merged
Conversation
Refactor hiding logic into a new hideRuler(_:) helper and replace closePreferences(_: ) with closeKeyWindow(_: ). The new action will close the focused ruler (ungrouping if needed) or forward to the key window's performClose. Update validateMenuItem to reflect the new selector and update MainMenu.xib to use closeKeyWindow:. Add a UI test (testRulerCloseWithCommandW) to assert Command-W closes a visible ruler. Fixes #158
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the app’s Cmd-W (“Close”) behavior to close the currently focused ruler window when applicable, otherwise delegating to the active key window’s standard close behavior (fixing Cmd-W not closing non-preferences windows like the About window per #158).
Changes:
- Refactors ruler-hiding logic into a
hideRuler(_:)helper. - Replaces the menu action
closePreferences(_:)withcloseKeyWindow(_:), routing Cmd-W to close the focused ruler or callperformCloseon the key window. - Updates
validateMenuItemandMainMenu.xib, and adds a UI test for Cmd-W closing a ruler.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| FreeRulerUITests/FreeRulerUITests.swift | Adds a UI test for Cmd-W closing a ruler window. |
| Free Ruler/Base.lproj/MainMenu.xib | Rewires the Close menu item to call closeKeyWindow:. |
| Free Ruler/AppDelegate.swift | Adds hideRuler(_:), implements closeKeyWindow(_:), and updates menu item validation. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
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
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.
Refactor hiding logic into a new hideRuler(:) helper and replace closePreferences(: ) with closeKeyWindow(_: ). The new action will close the focused ruler (ungrouping if needed) or forward to the key window's performClose. Update validateMenuItem to reflect the new selector and update MainMenu.xib to use closeKeyWindow:. Add a UI test (testRulerCloseWithCommandW) to assert Command-W closes a visible ruler.
Fixes #158