Skip to content

Rename primary ruler window #257

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
pascalpp merged 1 commit into from
Jun 19, 2026
Merged

Rename primary ruler window #257

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
14 changes: 7 additions & 7 deletions Free Ruler/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
]

// let rulers know about each other
// TODO: provide each ruler with otherRulers: [RulerWindow]
// TODO: provide each ruler with otherRulers: [LegacyRulerWindow]
rulers[0].otherWindow = rulers[1].rulerWindow
rulers[1].otherWindow = rulers[0].rulerWindow

Expand Down Expand Up @@ -443,10 +443,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
guard hasLegacyAutosave else { return nil }

let settings = RulerSettings(defaults: prefs)
let horizontalWindow = RulerWindow(
let horizontalWindow = LegacyRulerWindow(
ruler: Ruler(.horizontal, name: horizontalAutosaveName)
)
let verticalWindow = RulerWindow(
let verticalWindow = LegacyRulerWindow(
ruler: Ruler(.vertical, name: verticalAutosaveName)
)
_ = horizontalWindow.setFrameUsingName(NSWindow.FrameAutosaveName(horizontalAutosaveName))
Expand Down Expand Up @@ -510,7 +510,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
}

private func detachRulerWindow(_ window: RulerWindow) {
private func detachRulerWindow(_ window: LegacyRulerWindow) {
for ruler in rulers {
guard ruler.rulerWindow != window else { continue }

Expand Down Expand Up @@ -966,15 +966,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
prefs.unit = unit
}

func isRulerWindowShown(_ window: RulerWindow) -> Bool {
func isRulerWindowShown(_ window: LegacyRulerWindow) -> Bool {
return window.isVisible || window.parent != nil || rulers.contains {
$0.rulerWindow.childWindows?.contains(window) == true
}
}

private func zeroPointOffset(
from sourceWindow: RulerWindow?,
to targetWindow: RulerWindow?,
from sourceWindow: LegacyRulerWindow?,
to targetWindow: LegacyRulerWindow?,
geometry: ZeroCornerGeometry
) -> NSSize? {
guard let sourceWindow = sourceWindow,
Expand Down
Loading