Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat(macos): Add draggable surfaces

Browse Source 
1. Fixes #5259.
2. Each surface now has its own phantom draggable titlebar except the topmost
ones (when titlebar is visible).
This commit is contained in:
Vladislav Korikhin
2025-01-24 03:03:57 +07:00
parent 72d085525b
commit a41c1dea9e
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
macos/Sources/Ghostty/SurfaceView_AppKit.swift
View File

@ -579,12 +579,36 @@ extension Ghostty {
return true
}
override func mouseDown(with event: NSEvent) {
guard let surface = self.surface else { return }
private func handleSurfaceMouseDown(_ surface: ghostty_surface_t, _ event: NSEvent) {
let mods = Ghostty.ghosttyMods(event.modifierFlags)
ghostty_surface_mouse_button(surface, GHOSTTY_MOUSE_PRESS, GHOSTTY_MOUSE_LEFT, mods)
}
override func mouseDown(with event: NSEvent) {
guard let surface = self.surface else { return }
guard let window = self.window else {
handleSurfaceMouseDown(surface, event)
return
}
let point = self.convert(event.locationInWindow, from: nil)
let titlebarHeight = window.frame.height - window.contentLayoutRect.height
let isInTitlebarRegion = point.y >= self.frame.height - titlebarHeight
let isTitlebarVisible =
self.derivedConfig.windowDecoration
&& self.derivedConfig.macosTitlebarStyle != "hidden"
let frame = self.convert(self.frame, to: nil)
let isTop = abs(window.contentLayoutRect.maxY - frame.maxY) < 1
if isInTitlebarRegion && !(isTop && isTitlebarVisible) {
window.performDrag(with: event)
return
}
handleSurfaceMouseDown(surface, event)
}
override func mouseUp(with event: NSEvent) {
// Always reset our pressure when the mouse goes up
prevPressureStage = 0
@ -1253,6 +1277,8 @@ extension Ghostty {
let macosWindowShadow: Bool
let windowTitleFontFamily: String?
let windowAppearance: NSAppearance?
let windowDecoration: Bool
let macosTitlebarStyle: String
init() {
self.backgroundColor = Color(NSColor.windowBackgroundColor)
@ -1260,6 +1286,8 @@ extension Ghostty {
self.macosWindowShadow = true
self.windowTitleFontFamily = nil
self.windowAppearance = nil
self.windowDecoration = true
self.macosTitlebarStyle = "transparent"
}
init(_ config: Ghostty.Config) {
@ -1268,6 +1296,8 @@ extension Ghostty {
self.macosWindowShadow = config.macosWindowShadow
self.windowTitleFontFamily = config.windowTitleFontFamily
self.windowAppearance = .init(ghosttyConfig: config)
self.windowDecoration = config.windowDecorations
self.macosTitlebarStyle = config.macosTitlebarStyle
}
}
}