Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-20 02:36:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Round quick terminal window position coordinates

Browse Source 
This resolves an issue where the right side of the quick terminal would
not resize equally to the left side if adjusting the width from the left
side.
This commit is contained in:
Friedrich Stoltzfus
2025-06-26 10:51:36 -04:00
committed by Mitchell Hashimoto
parent ecafe92516
commit 982d1bc27d
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
macos/Sources/Features/QuickTerminal/QuickTerminalPosition.swift
View File

@ -58,19 +58,19 @@ enum QuickTerminalPosition : String {
func initialOrigin(for window: NSWindow, on screen: NSScreen) -> CGPoint { func initialOrigin(for window: NSWindow, on screen: NSScreen) -> CGPoint {
switch (self) { switch (self) {
case .top: case .top:
return .init(x: screen.frame.origin.x + (screen.frame.width - window.frame.width) / 2, y: screen.frame.maxY) return .init(x: round(screen.frame.origin.x + (screen.frame.width - window.frame.width) / 2), y: screen.frame.maxY)
case .bottom: case .bottom:
return .init(x: screen.frame.origin.x + (screen.frame.width - window.frame.width) / 2, y: -window.frame.height) return .init(x: round(screen.frame.origin.x + (screen.frame.width - window.frame.width) / 2), y: -window.frame.height)
case .left: case .left:
return .init(x: screen.frame.minX-window.frame.width, y: screen.frame.origin.y + (screen.frame.height - window.frame.height) / 2) return .init(x: screen.frame.minX-window.frame.width, y: round(screen.frame.origin.y + (screen.frame.height - window.frame.height) / 2))
case .right: case .right:
return .init(x: screen.frame.maxX, y: screen.frame.origin.y + (screen.frame.height - window.frame.height) / 2) return .init(x: screen.frame.maxX, y: round(screen.frame.origin.y + (screen.frame.height - window.frame.height) / 2))
case .center: case .center:
return .init(x: screen.visibleFrame.origin.x + (screen.visibleFrame.width - window.frame.width) / 2, y: screen.visibleFrame.height - window.frame.width) return .init(x: round(screen.visibleFrame.origin.x + (screen.visibleFrame.width - window.frame.width) / 2), y: screen.visibleFrame.height - window.frame.width)
} }
} }
@ -78,19 +78,19 @@ enum QuickTerminalPosition : String {
func finalOrigin(for window: NSWindow, on screen: NSScreen) -> CGPoint { func finalOrigin(for window: NSWindow, on screen: NSScreen) -> CGPoint {
switch (self) { switch (self) {
case .top: case .top:
return .init(x: screen.frame.origin.x + (screen.frame.width - window.frame.width) / 2, y: screen.visibleFrame.maxY - window.frame.height) return .init(x: round(screen.frame.origin.x + (screen.frame.width - window.frame.width) / 2), y: screen.visibleFrame.maxY - window.frame.height)
case .bottom: case .bottom:
return .init(x: screen.frame.origin.x + (screen.frame.width - window.frame.width) / 2, y: screen.frame.minY) return .init(x: round(screen.frame.origin.x + (screen.frame.width - window.frame.width) / 2), y: screen.frame.minY)
case .left: case .left:
return .init(x: screen.frame.minX, y: screen.frame.origin.y + (screen.frame.height - window.frame.height) / 2) return .init(x: screen.frame.minX, y: round(screen.frame.origin.y + (screen.frame.height - window.frame.height) / 2))
case .right: case .right:
return .init(x: screen.visibleFrame.maxX - window.frame.width, y: screen.frame.origin.y + (screen.frame.height - window.frame.height) / 2) return .init(x: screen.visibleFrame.maxX - window.frame.width, y: round(screen.frame.origin.y + (screen.frame.height - window.frame.height) / 2))
case .center: case .center:
return .init(x: screen.visibleFrame.origin.x + (screen.visibleFrame.width - window.frame.width) / 2, y: screen.visibleFrame.origin.y + (screen.visibleFrame.height - window.frame.height) / 2) return .init(x: round(screen.visibleFrame.origin.x + (screen.visibleFrame.width - window.frame.width) / 2), y: round(screen.visibleFrame.origin.y + (screen.visibleFrame.height - window.frame.height) / 2))
} }
} }
@ -117,20 +117,20 @@ enum QuickTerminalPosition : String {
switch self { switch self {
case .top: case .top:
return CGPoint( return CGPoint(
x: screen.frame.origin.x + (screen.frame.width - window.frame.width) / 2, x: round(screen.frame.origin.x + (screen.frame.width - window.frame.width) / 2),
y: window.frame.origin.y // Keep the same Y position y: window.frame.origin.y // Keep the same Y position
) )
case .bottom: case .bottom:
return CGPoint( return CGPoint(
x: screen.frame.origin.x + (screen.frame.width - window.frame.width) / 2, x: round(screen.frame.origin.x + (screen.frame.width - window.frame.width) / 2),
y: window.frame.origin.y // Keep the same Y position y: window.frame.origin.y // Keep the same Y position
) )
case .center: case .center:
return CGPoint( return CGPoint(
x: screen.visibleFrame.origin.x + (screen.visibleFrame.width - window.frame.width) / 2, x: round(screen.visibleFrame.origin.x + (screen.visibleFrame.width - window.frame.width) / 2),
y: screen.visibleFrame.origin.y + (screen.visibleFrame.height - window.frame.height) / 2 y: round(screen.visibleFrame.origin.y + (screen.visibleFrame.height - window.frame.height) / 2)
) )
case .left, .right: case .left, .right:
@ -145,13 +145,13 @@ enum QuickTerminalPosition : String {
case .left: case .left:
return CGPoint( return CGPoint(
x: window.frame.origin.x, // Keep the same X position x: window.frame.origin.x, // Keep the same X position
y: screen.frame.origin.y + (screen.frame.height - window.frame.height) / 2 y: round(screen.frame.origin.y + (screen.frame.height - window.frame.height) / 2)
) )
case .right: case .right:
return CGPoint( return CGPoint(
x: window.frame.origin.x, // Keep the same X position x: window.frame.origin.x, // Keep the same X position
y: screen.frame.origin.y + (screen.frame.height - window.frame.height) / 2 y: round(screen.frame.origin.y + (screen.frame.height - window.frame.height) / 2)
) )
case .top, .bottom, .center: case .top, .bottom, .center: