Skip to content

Organize thirds and size actions into menu submenus #1721

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

Closed
MyronKoch wants to merge 2 commits into from
+3 −8
Closed

Organize thirds and size actions into menu submenus #1721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e180e2e
Organize thirds and size actions into menu submenus
MyronKoch Mar 13, 2026
1cf29c9
Include width/height size variants in submenu and clean up eighths code
MyronKoch Mar 13, 2026
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: 0 additions & 6 deletions Rectangle/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
@IBOutlet weak var updatesMenuItem: NSMenuItem!
@IBOutlet weak var quitMenuItem: NSMenuItem!

var eighthsMenuItem: NSMenuItem?

static var instance: AppDelegate {
NSApp.delegate as! AppDelegate
}
Expand Down Expand Up @@ -411,10 +409,6 @@ extension AppDelegate: NSMenuDelegate {
for categoryMenu in categoryMenus {
categoryMenu.menu.delegate = self
let menuMenuItem = NSMenuItem(title: categoryMenu.category.displayName, action: nil, keyEquivalent: "")
if categoryMenu.category == .eighths {
eighthsMenuItem = menuMenuItem
eighthsMenuItem?.isHidden = !Defaults.showEighthsInMenu.userEnabled
}
mainStatusMenu.insertItem(menuMenuItem, at: menuIndex)
mainStatusMenu.setSubmenu(categoryMenu.menu, for: menuMenuItem)
menuIndex += 1
Expand Down
1 change: 0 additions & 1 deletion Rectangle/PrefsWindow/SettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ class SettingsViewController: NSViewController {
@objc func toggleShowEighthsInMenu(_ sender: NSButton) {
let enabled: Bool = sender.state == .on
Defaults.showEighthsInMenu.enabled = enabled
AppDelegate.instance.eighthsMenuItem?.isHidden = !enabled
}

@IBAction func checkForUpdates(_ sender: Any) {
Expand Down
4 changes: 3 additions & 1 deletion Rectangle/WindowAction.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ enum WindowAction: Int, Codable {
// Determines where separators should be used in the menu
var firstInGroup: Bool {
switch self {
case .leftHalf, .topLeft, .firstThird, .maximize, .nextDisplay, .moveLeft, .firstFourth, .topLeftSixth, .topLeftEighth:
case .leftHalf, .topLeft, .firstThird, .maximize, .almostMaximize, .nextDisplay, .moveLeft, .firstFourth, .topLeftSixth, .topLeftEighth:
return true
default:
return false
Expand Down Expand Up @@ -652,10 +652,12 @@ enum WindowAction: Int, Codable {

var category: WindowActionCategory? { // used to specify a submenu
switch self {
case .firstThird, .centerThird, .lastThird, .firstTwoThirds, .centerTwoThirds, .lastTwoThirds: return .thirds
case .firstFourth, .secondFourth, .thirdFourth, .lastFourth, .firstThreeFourths, .centerThreeFourths, .lastThreeFourths: return .fourths
case .topLeftSixth, .topCenterSixth, .topRightSixth, .bottomLeftSixth, .bottomCenterSixth, .bottomRightSixth: return .sixths
case .topLeftEighth, .topCenterLeftEighth, .topCenterRightEighth, .topRightEighth, .bottomLeftEighth, .bottomCenterLeftEighth, .bottomCenterRightEighth, .bottomRightEighth: return .eighths
case .moveUp, .moveDown, .moveLeft, .moveRight: return .move
case .almostMaximize, .maximizeHeight, .larger, .smaller, .largerWidth, .smallerWidth, .largerHeight, .smallerHeight: return .size
default: return nil
}
}
Expand Down