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

Merge pull request #2165 from ghostty-org/push-otsyrmzktntn

Browse Source 
macos: get updated surface size metrics immediately on resize
This commit is contained in:
Mitchell Hashimoto
2024-08-29 15:05:32 -07:00
committed by GitHub
parent fcb8b04049 90d24f9e82
commit 602bf6ba1e
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,10 @@ extension Ghostty {
// on supported platforms. // on supported platforms.
@Published var focusInstant: Any? = nil @Published var focusInstant: Any? = nil
// Returns sizing information for the surface. This is the raw C
// structure because I'm lazy.
@Published var surfaceSize: ghostty_surface_size_s? = nil
// An initial size to request for a window. This will only affect // An initial size to request for a window. This will only affect
// then the view is moved to a new window. // then the view is moved to a new window.
var initialSize: NSSize? = nil var initialSize: NSSize? = nil
@ -55,14 +59,6 @@ extension Ghostty {
if (v.count == 0) { return nil } if (v.count == 0) { return nil }
return v return v
} }
// Returns sizing information for the surface. This is the raw C
// structure because I'm lazy.
var surfaceSize: ghostty_surface_size_s? {
guard let surface = self.surface else { return nil }
return ghostty_surface_size(surface)
}
// Returns the inspector instance for this surface, or nil if the // Returns the inspector instance for this surface, or nil if the
// surface has been closed. // surface has been closed.
var inspector: ghostty_inspector_t? { var inspector: ghostty_inspector_t? {
@ -229,7 +225,7 @@ extension Ghostty {
// an animation (i.e. a fullscreen animation), the frame will not yet be updated. // an animation (i.e. a fullscreen animation), the frame will not yet be updated.
// The size represents our final size we're going for. // The size represents our final size we're going for.
let scaledSize = self.convertToBacking(size) let scaledSize = self.convertToBacking(size)
ghostty_surface_set_size(surface, UInt32(scaledSize.width), UInt32(scaledSize.height)) setSurfaceSize(width: UInt32(scaledSize.width), height: UInt32(scaledSize.height))
// Frame changes do not always call mouseEntered/mouseExited, so we do some // Frame changes do not always call mouseEntered/mouseExited, so we do some
// calculations ourself to call those events. // calculations ourself to call those events.
@ -251,6 +247,16 @@ extension Ghostty {
} }
} }
private func setSurfaceSize(width: UInt32, height: UInt32) {
guard let surface = self.surface else { return }
// Update our core surface
ghostty_surface_set_size(surface, width, height)
// Update our cached size metrics
self.surfaceSize = ghostty_surface_size(surface)
}
func setCursorShape(_ shape: ghostty_mouse_shape_e) { func setCursorShape(_ shape: ghostty_mouse_shape_e) {
switch (shape) { switch (shape) {
case GHOSTTY_MOUSE_SHAPE_DEFAULT: case GHOSTTY_MOUSE_SHAPE_DEFAULT:
@ -441,7 +447,7 @@ extension Ghostty {
ghostty_surface_set_content_scale(surface, xScale, yScale) ghostty_surface_set_content_scale(surface, xScale, yScale)
// When our scale factor changes, so does our fb size so we send that too // When our scale factor changes, so does our fb size so we send that too
ghostty_surface_set_size(surface, UInt32(fbFrame.size.width), UInt32(fbFrame.size.height)) setSurfaceSize(width: UInt32(fbFrame.size.width), height: UInt32(fbFrame.size.height))
} }
override func updateLayer() { override func updateLayer() {