From ca37f3a0e751a21302d11508a57fe0b8a180a73d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 26 Dec 2025 13:59:49 -0800
Subject: [PATCH] macOS: add handle to the top of surfaces that can be used to
 drag

UI only
---
 .../Ghostty/Surface View/SurfaceView.swift    | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/macos/Sources/Ghostty/Surface View/SurfaceView.swift b/macos/Sources/Ghostty/Surface View/SurfaceView.swift
index 2d5039d29..a5e677c54 100644
--- a/macos/Sources/Ghostty/Surface View/SurfaceView.swift	
+++ b/macos/Sources/Ghostty/Surface View/SurfaceView.swift	
@@ -224,6 +224,10 @@ extension Ghostty {
                             .opacity(overlayOpacity)
                     }
                 }
+
+                // Grab handle for dragging the window. We want this to appear at the very
+                // top Z-index os it isn't faded by the unfocused overlay.
+                SurfaceGrabHandle()
             }
 
         }
@@ -952,6 +956,49 @@ extension Ghostty {
     }
 #endif
 
+    /// A grab handle overlay at the top of the surface for dragging the window.
+    /// Only appears when hovering in the top region of the surface.
+    struct SurfaceGrabHandle: View {
+        private let handleHeight: CGFloat = 10
+        
+        @State private var isHovering: Bool = false
+        @State private var isDragging: Bool = false
+        
+        var body: some View {
+            VStack(spacing: 0) {
+                Rectangle()
+                    .fill(Color.white.opacity(isHovering || isDragging ? 0.15 : 0))
+                    .frame(height: handleHeight)
+                    .overlay(alignment: .center) {
+                        if isHovering || isDragging {
+                            Capsule()
+                                .fill(Color.white.opacity(0.4))
+                                .frame(width: 40, height: 4)
+                        }
+                    }
+                    .contentShape(Rectangle())
+                    .onHover { hovering in
+                        withAnimation(.easeInOut(duration: 0.15)) {
+                            isHovering = hovering
+                        }
+                    }
+                    .gesture(
+                        DragGesture()
+                            .onChanged { _ in
+                                isDragging = true
+                            }
+                            .onEnded { _ in
+                                isDragging = false
+                            }
+                    )
+                    .backport.pointerStyle(isHovering ? .grabIdle : nil)
+                
+                Spacer()
+            }
+            .frame(maxWidth: .infinity, maxHeight: .infinity)
+        }
+    }
+
     /// Visual overlay that shows a border around the edges when the bell rings with border feature enabled.
     struct BellBorderOverlay: View {
         let bell: Bool