Skip to content

chore: apply low-risk maintenance #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brettinternet merged 1 commit into from
Sep 19, 2026
Merged

chore: apply low-risk maintenance #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions HyperWindow/Defaults.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ func registerDefaultPreferences(in defaults: UserDefaults = Current.defaults())
defaults.register(defaults: DefaultPreferences)
}

func toggleDefaultBool(for key: DefaultsKeys, defaults: UserDefaults = Current.defaults()) -> Bool {
let updatedValue = !defaults.bool(forKey: key.rawValue)
defaults.set(updatedValue, forKey: key.rawValue)
return updatedValue
}


protocol Defaultable {
init?(forKey: DefaultsKeys, defaults: UserDefaults)
Expand Down
26 changes: 4 additions & 22 deletions HyperWindow/PreferencesController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,24 +94,12 @@ class PreferencesController: NSWindowController {
}

@IBAction func resizeFromNearestCornerClicked(_ sender: Any) {
let value: NSNumber = {
var v = Current.defaults().bool(forKey: DefaultsKeys.resizeFromNearestCorner.rawValue)
v.toggle()
return NSNumber(booleanLiteral: v)
}()
Current.defaults().set(value, forKey: DefaultsKeys.resizeFromNearestCorner.rawValue)
_ = toggleDefaultBool(for: .resizeFromNearestCorner)
updateCopy()
}

@IBAction func hideMenuIconClicked(_ sender: Any) {
let value: NSNumber = {
var v = Current.defaults().bool(forKey:
DefaultsKeys.showMenuIcon.rawValue)
v.toggle()
return NSNumber(booleanLiteral: v)
}()
Current.defaults().set(value, forKey:
DefaultsKeys.showMenuIcon.rawValue)
_ = toggleDefaultBool(for: .showMenuIcon)
updateCopy()
(NSApp.delegate as? AppDelegate)?.updateStatusItemVisibility()
}
Expand All @@ -129,19 +117,13 @@ class PreferencesController: NSWindowController {
}

@IBAction func requireDragToActivateClicked(_ sender: Any) {
let value: NSNumber = {
var v = Current.defaults().bool(forKey: DefaultsKeys.requireDragToActivate.rawValue)
v.toggle()
return NSNumber(booleanLiteral: v)
}()
Current.defaults().set(value, forKey: DefaultsKeys.requireDragToActivate.rawValue)
_ = toggleDefaultBool(for: .requireDragToActivate)
Tracker.shared?.readModifiers() // Update the tracker with new setting
updateCopy()
}

@IBAction func focusWindowOnManipulationClicked(_ sender: Any) {
let key = DefaultsKeys.focusWindowOnManipulation.rawValue
Current.defaults().set(!Current.defaults().bool(forKey: key), forKey: key)
_ = toggleDefaultBool(for: .focusWindowOnManipulation)
Tracker.shared?.readModifiers()
updateFocusWindowPreferenceState()
}
Expand Down
11 changes: 11 additions & 0 deletions HyperWindowTests/DefaultsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,15 @@ final class DefaultsTests: XCTestCase {

XCTAssertFalse(defaults.bool(forKey: DefaultsKeys.showMenuIcon.rawValue))
}

func test_toggle_default_bool_flips_and_persists_value() {
let defaults = testUserDefaults()
defaults.set(true, forKey: DefaultsKeys.resizeFromNearestCorner.rawValue)

XCTAssertFalse(toggleDefaultBool(for: .resizeFromNearestCorner, defaults: defaults))
XCTAssertFalse(defaults.bool(forKey: DefaultsKeys.resizeFromNearestCorner.rawValue))

XCTAssertTrue(toggleDefaultBool(for: .resizeFromNearestCorner, defaults: defaults))
XCTAssertTrue(defaults.bool(forKey: DefaultsKeys.resizeFromNearestCorner.rawValue))
}
}