From 5bcde83a0837465c108e3dfdc74603e142f9ccc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=BF=9E=E8=BE=B0?= <lianchen551@163.com>
Date: Mon, 17 Apr 2023 23:06:40 +0800
Subject: [PATCH] v1.1.6

---
 .../OSXChatGPT.xcodeproj/project.pbxproj      |  4 +--
 .../OSXChatGPT/WindowView/AIPromptView.swift  |  7 ++--
 .../OSXChatGPT/WindowView/ChatRoomView.swift  | 34 +++++++++----------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/OSXChatGPT/OSXChatGPT.xcodeproj/project.pbxproj b/OSXChatGPT/OSXChatGPT.xcodeproj/project.pbxproj
index 417243d..ca80c3e 100644
--- a/OSXChatGPT/OSXChatGPT.xcodeproj/project.pbxproj
+++ b/OSXChatGPT/OSXChatGPT.xcodeproj/project.pbxproj
@@ -644,7 +644,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.1.5;
+				MARKETING_VERSION = 1.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = MustangYM.OSXChatGPT.OSXChatGPT;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -672,7 +672,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.1.5;
+				MARKETING_VERSION = 1.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = MustangYM.OSXChatGPT.OSXChatGPT;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
diff --git a/OSXChatGPT/OSXChatGPT/WindowView/AIPromptView.swift b/OSXChatGPT/OSXChatGPT/WindowView/AIPromptView.swift
index c37b59a..801abb4 100644
--- a/OSXChatGPT/OSXChatGPT/WindowView/AIPromptView.swift
+++ b/OSXChatGPT/OSXChatGPT/WindowView/AIPromptView.swift
@@ -165,10 +165,11 @@ struct AIPromptView: View {
                         }
                     }
                     .background(Color.clear)
+                    .padding(.leading, 16)
+                    .padding(.trailing, 16)
                 }
-                .padding(.leading, 16)
-                .padding(.trailing, 16)
-                .frame(width: geometry.size.width, height: geometry.size.height - 50)
+                .frame(width: geometry.size.width, height: geometry.size.height)
+                
                 
                 .onAppear {
                     
diff --git a/OSXChatGPT/OSXChatGPT/WindowView/ChatRoomView.swift b/OSXChatGPT/OSXChatGPT/WindowView/ChatRoomView.swift
index bb3e329..bd6625d 100644
--- a/OSXChatGPT/OSXChatGPT/WindowView/ChatRoomView.swift
+++ b/OSXChatGPT/OSXChatGPT/WindowView/ChatRoomView.swift
@@ -66,8 +66,8 @@ struct ChatRoomView: View {
                         self.scrollView = scrollView
                     }
                 }
+                .frame(maxHeight: geometry.size.height) // 限制高度以便滚动
                 .background(Color.clear)
-            .frame(maxHeight: geometry.size.height - inputViewHeight) // 限制高度以便滚动
             Divider()
             GeometryReader { toolBarGeometry in
                 Spacer()
@@ -160,21 +160,21 @@ struct ChatRoomCellView: View {
                         }
                     }
 
-                VStack {
-                    Image("User")
-                        .resizable()
-                        .frame(width: 30, height: 30)
-                        .padding(0)
-                    Spacer()
-                }
+//                VStack {
+//                    Image("User")
+//                        .resizable()
+//                        .frame(width: 30, height: 30)
+//                        .padding(0)
+//                    Spacer()
+//                }
             } else {
-                VStack {
-                    Image("openAI_icon")
-                        .resizable()
-                        .frame(width: 30, height: 30)
-                        .padding(0)
-                    Spacer()
-                }
+//                VStack {
+//                    Image("openAI_icon")
+//                        .resizable()
+//                        .frame(width: 30, height: 30)
+//                        .padding(0)
+//                    Spacer()
+//                }
                 if message.msgType == .waitingReply {
                     //等待chatGPT回复的动画
                     ThinkingAnimationView()
@@ -222,8 +222,8 @@ struct ChatRoomCellView: View {
                 Spacer()
             }
         }
-        .padding(.trailing, (message.role == ChatGPTManager.shared.gptRoleString) ? 70 : 0)
-        .padding(.leading, (message.role != ChatGPTManager.shared.gptRoleString) ? 70 : 0)
+        .padding(.trailing, (message.role == ChatGPTManager.shared.gptRoleString) ? 30 : 0)
+        .padding(.leading, (message.role != ChatGPTManager.shared.gptRoleString) ? 30 : 0)
     }
 }