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

macos: fix non-AppKit builds

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-09-21 10:22:04 -07:00
parent 3769c83bdf
commit d090384600
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macos/Ghostty.xcodeproj/project.pbxproj
View File

@ -60,6 +60,7 @@
A5B30539299BEAAB0047F10C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A5B30538299BEAAB0047F10C /* Assets.xcassets */; }; A5B30539299BEAAB0047F10C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A5B30538299BEAAB0047F10C /* Assets.xcassets */; };
A5CBD0562C9E65B80017A1AE /* DraggableWindowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CBD0552C9E65A50017A1AE /* DraggableWindowView.swift */; }; A5CBD0562C9E65B80017A1AE /* DraggableWindowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CBD0552C9E65A50017A1AE /* DraggableWindowView.swift */; };
A5CBD0582C9F30960017A1AE /* Cursor.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CBD0572C9F30860017A1AE /* Cursor.swift */; }; A5CBD0582C9F30960017A1AE /* Cursor.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CBD0572C9F30860017A1AE /* Cursor.swift */; };
A5CBD0592C9F37B10017A1AE /* Backport.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CEAFFE29C2410700646FDA /* Backport.swift */; };
A5CC36132C9CD72D004D6760 /* SecureInputOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CC36122C9CD729004D6760 /* SecureInputOverlay.swift */; }; A5CC36132C9CD72D004D6760 /* SecureInputOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CC36122C9CD729004D6760 /* SecureInputOverlay.swift */; };
A5CC36152C9CDA06004D6760 /* View+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CC36142C9CDA03004D6760 /* View+Extension.swift */; }; A5CC36152C9CDA06004D6760 /* View+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CC36142C9CDA03004D6760 /* View+Extension.swift */; };
A5CDF1912AAF9A5800513312 /* ConfigurationErrors.xib in Resources */ = {isa = PBXBuildFile; fileRef = A5CDF1902AAF9A5800513312 /* ConfigurationErrors.xib */; }; A5CDF1912AAF9A5800513312 /* ConfigurationErrors.xib in Resources */ = {isa = PBXBuildFile; fileRef = A5CDF1902AAF9A5800513312 /* ConfigurationErrors.xib */; };
@ -566,6 +567,7 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
A5CBD0592C9F37B10017A1AE /* Backport.swift in Sources */,
A53D0C942B53B43700305CE6 /* iOSApp.swift in Sources */, A53D0C942B53B43700305CE6 /* iOSApp.swift in Sources */,
A514C8D72B54A16400493A16 /* Ghostty.Config.swift in Sources */, A514C8D72B54A16400493A16 /* Ghostty.Config.swift in Sources */,
A5333E232B5A219A008AEFF7 /* SurfaceView.swift in Sources */, A5333E232B5A219A008AEFF7 /* SurfaceView.swift in Sources */,

2
macos/Sources/Ghostty/SurfaceView.swift
View File

@ -59,6 +59,7 @@ extension Ghostty {
@EnvironmentObject private var ghostty: Ghostty.App @EnvironmentObject private var ghostty: Ghostty.App
#if canImport(AppKit)
// The visibility state of the mouse pointer // The visibility state of the mouse pointer
private var pointerVisibility: BackportVisibility { private var pointerVisibility: BackportVisibility {
// If our window or surface loses focus we always bring it back // If our window or surface loses focus we always bring it back
@ -73,6 +74,7 @@ extension Ghostty {
return .hidden return .hidden
} }
} }
#endif
var body: some View { var body: some View {
let center = NotificationCenter.default let center = NotificationCenter.default

10
macos/Sources/Helpers/Backport.swift
View File

@ -26,19 +26,27 @@ extension Backport where Content: Scene {
extension Backport where Content: View { extension Backport where Content: View {
func pointerVisibility(_ v: BackportVisibility) -> some View { func pointerVisibility(_ v: BackportVisibility) -> some View {
#if canImport(AppKit)
if #available(macOS 15, *) { if #available(macOS 15, *) {
return content.pointerVisibility(v.official) return content.pointerVisibility(v.official)
} else { } else {
return content return content
} }
#else
return content
#endif
} }
func pointerStyle(_ style: BackportPointerStyle?) -> some View { func pointerStyle(_ style: BackportPointerStyle?) -> some View {
#if canImport(AppKit)
if #available(macOS 15, *) { if #available(macOS 15, *) {
return content.pointerStyle(style?.official) return content.pointerStyle(style?.official)
} else { } else {
return content return content
} }
#else
return content
#endif
} }
} }
@ -71,6 +79,7 @@ enum BackportPointerStyle {
case resizeUpDown case resizeUpDown
case resizeLeftRight case resizeLeftRight
#if canImport(AppKit)
@available(macOS 15, *) @available(macOS 15, *)
var official: PointerStyle { var official: PointerStyle {
switch self { switch self {
@ -88,4 +97,5 @@ enum BackportPointerStyle {
case .resizeLeftRight: return .frameResize(position: .trailing) case .resizeLeftRight: return .frameResize(position: .trailing)
} }
} }
#endif
} }