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 #2285 from ghostty-org/push-lwxwvlyootok

Browse Source 
macos: cannot call mouseEntered/Exited with blank NSEvent
This commit is contained in:
Mitchell Hashimoto
2024-09-22 10:28:07 -07:00
committed by GitHub
parent 6607ffa7f4 c63af5efaa
commit ce73917325
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,25 +233,6 @@ extension Ghostty {
// 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)
setSurfaceSize(width: UInt32(scaledSize.width), height: UInt32(scaledSize.height)) setSurfaceSize(width: UInt32(scaledSize.width), height: UInt32(scaledSize.height))
// Frame changes do not always call mouseEntered/mouseExited, so we do some
// calculations ourself to call those events.
if let window = self.window {
let mouseScreen = NSEvent.mouseLocation
let mouseWindow = window.convertPoint(fromScreen: mouseScreen)
let mouseView = self.convert(mouseWindow, from: nil)
let isEntered = self.isMousePoint(mouseView, in: bounds)
if (isEntered) {
mouseEntered(with: NSEvent())
} else {
mouseExited(with: NSEvent())
}
} else {
// If we don't have a window, then our mouse can NOT be in our view.
// When the window comes back, I believe this event fires again so
// we'll get a mouseEntered.
mouseExited(with: NSEvent())
}
} }
private func setSurfaceSize(width: UInt32, height: UInt32) { private func setSurfaceSize(width: UInt32, height: UInt32) {
@ -261,7 +242,13 @@ extension Ghostty {
ghostty_surface_set_size(surface, width, height) ghostty_surface_set_size(surface, width, height)
// Update our cached size metrics // Update our cached size metrics
self.surfaceSize = ghostty_surface_size(surface) let size = ghostty_surface_size(surface)
DispatchQueue.main.async {
// DispatchQueue required since this may be called by SwiftUI off
// the main thread and Published changes need to be on the main
// thread. This caused a crash on macOS <= 14.
self.surfaceSize = size
}
} }
func setCursorShape(_ shape: ghostty_mouse_shape_e) { func setCursorShape(_ shape: ghostty_mouse_shape_e) {