Merge branch 'vapidinfinity-main'

Author: plyght

Discord/ContentView.swift

@@ -20,45 +20,49 @@ struct ContentView: View {
 }
 
 struct DraggableView: NSViewRepresentable {
+    class Coordinator: NSObject {
+        @objc func handlePanGesture(_ gesture: NSPanGestureRecognizer) {
+            guard let window = gesture.view?.window, let event = NSApp.currentEvent else { return }
+
+            switch gesture.state {
+            case .began, .changed:
+                window.performDrag(with: event)
+            default:
+                break
+            }
+        }
+    }
+
     func makeNSView(context: Context) -> NSView {
-        let view = DragView()
+        let view = NSView()
         view.wantsLayer = true
         view.layer?.backgroundColor = .clear
-        
+
         // Ensure the view is above others and can receive mouse events
         view.translatesAutoresizingMaskIntoConstraints = false
         view.layer?.zPosition = 999
+
+        let panGesture = NSPanGestureRecognizer(
+            target: context.coordinator,
+            action: #selector(Coordinator.handlePanGesture(_:))
+        )
+        panGesture.allowedTouchTypes = [.direct]
+        view.addGestureRecognizer(panGesture)
+
         return view
     }
-    
+
     func updateNSView(_ nsView: NSView, context: Context) {}
-}
 
-class DragView: NSView {
-    // Allow dragging the window from this view
-    override var mouseDownCanMoveWindow: Bool { true }
-    
-    override var allowsVibrancy: Bool { true }
-    
-    override func hitTest(_ point: NSPoint) -> NSView? {
-        if let currentEvent = NSApplication.shared.currentEvent,
-           currentEvent.type == .leftMouseDown ||
-           (currentEvent.type == .leftMouseDragged && NSEvent.pressedMouseButtons == 1) {
-            return self
-        }
-        // Pass through all other events
-        return nil
-    }
-    
-    override func mouseDown(with event: NSEvent) {
-        window?.performDrag(with: event)
+    func makeCoordinator() -> Coordinator {
+        Coordinator()
     }
 }
 
 struct VisualEffectView: NSViewRepresentable {
     let material: NSVisualEffectView.Material
     let blendingMode: NSVisualEffectView.BlendingMode
-    
+
     func makeNSView(context: Context) -> NSVisualEffectView {
         let visualEffectView = NSVisualEffectView()
         visualEffectView.material = material

Discord/DiscordWindowContent.swift

@@ -23,7 +23,7 @@ struct DiscordWindowContent: View {
                         customCSS: customCSS,
                         webViewReference: $webViewReference)
                     .frame(maxWidth: .infinity, maxHeight: .infinity)
-                    .onChange(of: fakeNitro) { fakeNitro in
+                    .onChange(of: fakeNitro) {
                         guard let webView = webViewReference else { return }
                         if fakeNitro {
                             enableFakeNitro(webView)
@@ -35,7 +35,7 @@ struct DiscordWindowContent: View {
 
             // Draggable area for traffic lights
             DraggableView()
-                .frame(width: 70, height: 48)
+                .frame(height: 48)
         }
         .ignoresSafeArea()
         .frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -57,3 +57,7 @@ func enableFakeNitro(_ webView: WKWebView) {
     webView.reload()
     webView.configuration.userContentController.addUserScript(WKUserScript(source: script, injectionTime: .atDocumentEnd, forMainFrameOnly: true))
 }
+
+#Preview {
+    DiscordWindowContent(channelClickWidth: 1000)
+}

Voxa.xcodeproj/project.pbxproj

@@ -286,7 +286,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Discord/Preview Content\"";
-				DEVELOPMENT_TEAM = 7BRPLLH5D4;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -324,7 +324,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Discord/Preview Content\"";
-				DEVELOPMENT_TEAM = 7BRPLLH5D4;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;