Skip to content

Commit 8c95c66

Browse files
committed
Completely separate isPanelDisplayed of chat and suggestion
1 parent ba33fd5 commit 8c95c66

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ public extension SuggestionWidgetController {
250250
Task {
251251
if let suggestion = await dataSource?.suggestionForFile(at: fileURL) {
252252
suggestionPanelViewModel.content = .suggestion(suggestion)
253-
chatWindowViewModel.isPanelDisplayed = true
254253
suggestionPanelViewModel.isPanelDisplayed = true
255254
panelWindow.orderFront(nil)
256255
}
@@ -270,7 +269,6 @@ public extension SuggestionWidgetController {
270269

271270
func presentError(_ errorDescription: String) {
272271
suggestionPanelViewModel.content = .error(errorDescription)
273-
chatWindowViewModel.isPanelDisplayed = true
274272
suggestionPanelViewModel.isPanelDisplayed = true
275273
widgetViewModel.isProcessing = false
276274
panelWindow.orderFront(nil)
@@ -282,7 +280,6 @@ public extension SuggestionWidgetController {
282280
if let chat = await dataSource?.chatForFile(at: fileURL) {
283281
chatWindowViewModel.chat = chat
284282
chatWindowViewModel.isPanelDisplayed = true
285-
suggestionPanelViewModel.isPanelDisplayed = true
286283
suggestionPanelViewModel.chat = chat
287284

288285
if UserDefaults.shared.value(for: \.chatPanelInASeparateWindow) {
@@ -311,7 +308,6 @@ public extension SuggestionWidgetController {
311308
Task {
312309
if let provider = await dataSource?.promptToCodeForFile(at: fileURL) {
313310
suggestionPanelViewModel.content = .promptToCode(provider)
314-
chatWindowViewModel.isPanelDisplayed = true
315311
suggestionPanelViewModel.isPanelDisplayed = true
316312

317313
Task { @MainActor in

Core/Sources/SuggestionWidget/WidgetView.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ struct WidgetView: View {
2525
Circle().fill(isHovering ? .white.opacity(0.8) : .white.opacity(0.3))
2626
.onTapGesture {
2727
withAnimation(.easeInOut(duration: 0.2)) {
28-
panelViewModel.isPanelDisplayed.toggle()
29-
chatWindowViewModel.isPanelDisplayed = panelViewModel.isPanelDisplayed
28+
let isDisplayed = panelViewModel.isPanelDisplayed
29+
|| chatWindowViewModel.isPanelDisplayed
30+
panelViewModel.isPanelDisplayed = !isDisplayed
31+
chatWindowViewModel.isPanelDisplayed = !isDisplayed
3032
}
3133
}
3234
.overlay {

0 commit comments

Comments
 (0)