Skip to content

Fix menu item switch offset #121

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

Open
dnicolson wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix menu item switch offset #121

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
24 changes: 24 additions & 0 deletions Shifty/StatusMenuController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,30 @@ class StatusMenuController: NSObject, NSMenuDelegate {
disableCustomMenuItem.title = NSLocalizedString("menu.disabled_custom", comment: "Disabled for custom time")
}

if #available(macOS 11.0, *) {
let menuHasOnState = statusMenu.items.filter { menuItem in
return menuItem.state == .on
}.count > 0

var menuOffset = 12.0
if menuHasOnState {
menuOffset += 10.0
}

if let nightShiftSwitchView = nightShiftSwitchView as? SwitchView {
for constraint in nightShiftSwitchView.constraints where (
constraint.firstAttribute == .leading) {
constraint.constant = menuOffset
}
}

if let trueToneSwitchView = trueToneSwitchView as? SwitchView {
for constraint in trueToneSwitchView.constraints where (
constraint.firstAttribute == .leading) {
constraint.constant = menuOffset
}
}
}

// MARK: toggle True Tone
if #available(macOS 10.14, *) {
Expand Down