Skip to content

✨ Round custom frame if needed depending on unit #989

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
mrkai77 merged 1 commit into from
Jan 11, 2026
Merged

✨ Round custom frame if needed depending on unit #989

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
40 changes: 26 additions & 14 deletions Loop/Settings Window/Settings/Keybinds/Modal Views/CustomActionConfigurationView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,17 @@ struct CustomActionConfigurationView: View {
.topLeft, .top, .topRight, .left, .center, .right, .bottomLeft, .bottom, .bottomRight
]

private let previewController = PreviewController()
private let screenSize: CGSize = NSScreen.main?.frame.size ?? NSScreen.screens[0].frame.size
private var actionUnit: CustomWindowActionUnit {
action.unit ?? .percentage
}

private var showMacOSCenterToggle: Bool {
action.anchor ?? .center == .center || action.anchor == .macOSCenter
}

private let previewController = PreviewController()
private let screenSize: CGSize = NSScreen.main?.frame.size ?? NSScreen.screens[0].frame.size

init(action: Binding<WindowAction>, isPresented: Binding<Bool>) {
_windowAction = action
_isPresented = isPresented
Expand Down Expand Up @@ -151,6 +155,14 @@ struct CustomActionConfigurationView: View {
@ViewBuilder
private func unitToggle() -> some View {
LuminareToggle("Use pixels", isOn: Binding(get: { action.unit == .pixels }, set: { action.unit = $0 ? .pixels : .percentage }))
.onChange(of: actionUnit) { unit in
if unit == .percentage {
if let xPoint = action.xPoint { action.xPoint = max(0, min(100, xPoint)) }
if let yPoint = action.yPoint { action.yPoint = max(0, min(100, yPoint)) }
if let width = action.width { action.width = max(0, min(100, width)) }
if let height = action.height { action.height = max(0, min(100, height)) }
}
}
}

@ViewBuilder
Expand Down Expand Up @@ -258,11 +270,11 @@ struct CustomActionConfigurationView: View {
action.xPoint ?? 0
},
set: {
action.xPoint = $0
action.xPoint = actionUnit.roundIfNeeded($0)
}
),
in: action.unit == .percentage ? 0...100 : 0...Double(screenSize.width),
format: .number.precision(.fractionLength(0...0)),
in: actionUnit == .percentage ? 0...100 : 0...Double(screenSize.width),
format: .number.precision(actionUnit.fractionLength),
clampsUpper: false,
suffix: Text(action.unit?.suffix ?? CustomWindowActionUnit.percentage.suffix)
)
Expand All @@ -274,11 +286,11 @@ struct CustomActionConfigurationView: View {
action.yPoint ?? 0
},
set: {
action.yPoint = $0
action.yPoint = actionUnit.roundIfNeeded($0)
}
),
in: action.unit == .percentage ? 0...100 : 0...Double(screenSize.height),
format: .number.precision(.fractionLength(0...0)),
in: actionUnit == .percentage ? 0...100 : 0...Double(screenSize.height),
format: .number.precision(actionUnit.fractionLength),
clampsUpper: false,
suffix: Text(action.unit?.suffix ?? CustomWindowActionUnit.percentage.suffix)
)
Expand Down Expand Up @@ -324,11 +336,11 @@ struct CustomActionConfigurationView: View {
action.width ?? 100
},
set: {
action.width = $0
action.width = actionUnit.roundIfNeeded($0)
}
),
in: action.unit == .percentage ? 0...100 : 0...Double(screenSize.width),
format: .number.precision(.fractionLength(0...0)),
in: actionUnit == .percentage ? 0...100 : 0...Double(screenSize.width),
format: .number.precision(actionUnit.fractionLength),
clampsUpper: false,
suffix: .init(action.unit?.suffix ?? CustomWindowActionUnit.percentage.suffix)
)
Expand All @@ -340,11 +352,11 @@ struct CustomActionConfigurationView: View {
action.height ?? 100
},
set: {
action.height = $0
action.height = actionUnit.roundIfNeeded($0)
}
),
in: action.unit == .percentage ? 0...100 : 0...Double(screenSize.height),
format: .number.precision(.fractionLength(0...0)),
in: actionUnit == .percentage ? 0...100 : 0...Double(screenSize.height),
format: .number.precision(actionUnit.fractionLength),
clampsUpper: false,
suffix: .init(action.unit?.suffix ?? CustomWindowActionUnit.percentage.suffix)
)
Expand Down
28 changes: 16 additions & 12 deletions Loop/Settings Window/Settings/Keybinds/Modal Views/StashActionConfigurationView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ struct StashActionConfigurationView: View {
[.custom, .preserveSize]
}

private var actionUnit: CustomWindowActionUnit {
action.unit ?? .percentage
}

private let previewController = PreviewController()
private let screenSize: CGSize = NSScreen.main?.frame.size ?? NSScreen.screens[0].frame.size

Expand Down Expand Up @@ -206,11 +210,11 @@ struct StashActionConfigurationView: View {
action.xPoint ?? 0
},
set: {
action.xPoint = $0
action.xPoint = actionUnit.roundIfNeeded($0)
}
),
in: action.unit == .percentage ? 0...100 : 0...Double(screenSize.width),
format: .number.precision(.fractionLength(0...0)),
in: actionUnit == .percentage ? 0...100 : 0...Double(screenSize.width),
format: .number.precision(actionUnit.fractionLength),
clampsUpper: false,
suffix: Text(action.unit?.suffix ?? CustomWindowActionUnit.percentage.suffix)
)
Expand All @@ -222,11 +226,11 @@ struct StashActionConfigurationView: View {
action.yPoint ?? 0
},
set: {
action.yPoint = $0
action.yPoint = actionUnit.roundIfNeeded($0)
}
),
in: action.unit == .percentage ? 0...100 : 0...Double(screenSize.height),
format: .number.precision(.fractionLength(0...0)),
in: actionUnit == .percentage ? 0...100 : 0...Double(screenSize.height),
format: .number.precision(actionUnit.fractionLength),
clampsUpper: false,
suffix: Text(action.unit?.suffix ?? CustomWindowActionUnit.percentage.suffix)
)
Expand Down Expand Up @@ -272,11 +276,11 @@ struct StashActionConfigurationView: View {
action.width ?? 100
},
set: {
action.width = $0
action.width = actionUnit.roundIfNeeded($0)
}
),
in: action.unit == .percentage ? 0...100 : 0...Double(screenSize.width),
format: .number.precision(.fractionLength(0...0)),
in: actionUnit == .percentage ? 0...100 : 0...Double(screenSize.width),
format: .number.precision(actionUnit.fractionLength),
clampsUpper: false,
suffix: .init(action.unit?.suffix ?? CustomWindowActionUnit.percentage.suffix)
)
Expand All @@ -288,11 +292,11 @@ struct StashActionConfigurationView: View {
action.height ?? 100
},
set: {
action.height = $0
action.height = actionUnit.roundIfNeeded($0)
}
),
in: action.unit == .percentage ? 0...100 : 0...Double(screenSize.height),
format: .number.precision(.fractionLength(0...0)),
in: actionUnit == .percentage ? 0...100 : 0...Double(screenSize.height),
format: .number.precision(actionUnit.fractionLength),
clampsUpper: false,
suffix: .init(action.unit?.suffix ?? CustomWindowActionUnit.percentage.suffix)
)
Expand Down
18 changes: 18 additions & 0 deletions Loop/Window Management/Window Action/Custom Window Sizes/CustomWindowActionUnit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,22 @@ enum CustomWindowActionUnit: Int, Codable, CaseIterable, Identifiable {
String(localized: "%", comment: "Unit symbol: percentage")
}
}

var fractionLength: NumberFormatStyleConfiguration.Precision {
switch self {
case .pixels:
.fractionLength(0)
case .percentage:
.fractionLength(2)
}
}

func roundIfNeeded(_ value: Double) -> Double {
switch self {
case .pixels:
value.rounded()
case .percentage:
(value * 100.0).rounded() / 100.0
}
}
}