From 8eb4fb60e617aac4e645fd05694c57a1d31e7616 Mon Sep 17 00:00:00 2001
From: jack <jackjackbits@users.noreply.github.com>
Date: Wed, 1 Oct 2025 01:50:16 +0200
Subject: [PATCH] macOS: Focus message input on launch instead of nickname
 field

---
 bitchat/Views/ContentView.swift | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/bitchat/Views/ContentView.swift b/bitchat/Views/ContentView.swift
index 217f14e2..b795fd06 100644
--- a/bitchat/Views/ContentView.swift
+++ b/bitchat/Views/ContentView.swift
@@ -137,6 +137,7 @@ struct ContentView: View {
 // MARK: - Body
     
     var body: some View {
+<<<<<<< HEAD
         VStack(spacing: 0) {
             mainHeaderView
                 .onAppear { viewModel.currentColorScheme = colorScheme }
@@ -149,6 +150,30 @@ struct ContentView: View {
             GeometryReader { geometry in
                 VStack(spacing: 0) {
                     messagesView(privatePeer: nil, isAtBottom: $isAtBottomPublic)
+=======
+        GeometryReader { geometry in
+            ZStack {
+                // Base layer - Main public chat (always visible)
+                mainChatView
+                    .onAppear {
+                        viewModel.currentColorScheme = colorScheme
+                        #if os(macOS)
+                        // Focus message input on macOS launch, not nickname field
+                        DispatchQueue.main.async {
+                            isNicknameFieldFocused = false
+                            isTextFieldFocused = true
+                        }
+                        #endif
+                    }
+                    .onChange(of: colorScheme) { newValue in
+                        viewModel.currentColorScheme = newValue
+                    }
+                
+                // Private chat slide-over
+                if viewModel.selectedPrivateChatPeer != nil {
+                    privateChatView
+                        .frame(width: geometry.size.width)
+>>>>>>> 49a22aa9 (macOS: Focus message input on launch instead of nickname field)
                         .background(backgroundColor)
                         .frame(maxWidth: .infinity, maxHeight: .infinity)
                 }