From 371272ec14417e532a0adc8599c736923f22eae9 Mon Sep 17 00:00:00 2001 From: Austin Condiff Date: Wed, 15 Jan 2025 21:46:15 -0600 Subject: [PATCH 1/3] Added inactive state for activity viewer --- .../ActivityViewer/Notifications/TaskNotificationView.swift | 4 ++++ .../Features/ActivityViewer/Tasks/SchemeDropDownView.swift | 5 +++++ .../Features/ActivityViewer/Tasks/TaskDropDownView.swift | 5 +++++ CodeEdit/Features/ActivityViewer/Tasks/TaskView.swift | 1 + 4 files changed, 15 insertions(+) diff --git a/CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationView.swift b/CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationView.swift index d86df90d9b..8196e06072 100644 --- a/CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationView.swift +++ b/CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationView.swift @@ -8,6 +8,9 @@ import SwiftUI struct TaskNotificationView: View { + @Environment(\.controlActiveState) + private var activeState + @ObservedObject var taskNotificationHandler: TaskNotificationHandler @State private var isPresented: Bool = false @State var notification: TaskNotificationModel? @@ -46,6 +49,7 @@ struct TaskNotificationView: View { } } .transition(.opacity.combined(with: .move(edge: .trailing))) + .opacity(activeState == .inactive ? 0.4 : 1.0) .padding(3) .padding(-3) .padding(.trailing, 3) diff --git a/CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift b/CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift index 80e51d0d6c..87eda01051 100644 --- a/CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift +++ b/CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift @@ -11,6 +11,9 @@ struct SchemeDropDownView: View { @Environment(\.colorScheme) private var colorScheme + @Environment(\.controlActiveState) + private var activeState + @State var isSchemePopOverPresented: Bool = false @State private var isHoveringScheme: Bool = false @@ -30,7 +33,9 @@ struct SchemeDropDownView: View { ? (workspaceFileManager?.workspaceItem.fileName() ?? "No Project found") : workspaceName ) + .frame(minWidth: 0) } + .opacity(activeState == .inactive ? 0.4 : 1.0) .font(.subheadline) .padding(.trailing, 11.5) .padding(.horizontal, 2.5) diff --git a/CodeEdit/Features/ActivityViewer/Tasks/TaskDropDownView.swift b/CodeEdit/Features/ActivityViewer/Tasks/TaskDropDownView.swift index 2382cbec03..dc3fa6fc28 100644 --- a/CodeEdit/Features/ActivityViewer/Tasks/TaskDropDownView.swift +++ b/CodeEdit/Features/ActivityViewer/Tasks/TaskDropDownView.swift @@ -11,6 +11,9 @@ struct TaskDropDownView: View { @Environment(\.colorScheme) private var colorScheme + @Environment(\.controlActiveState) + private var activeState + @ObservedObject var taskManager: TaskManager @State private var isTaskPopOverPresented: Bool = false @@ -28,8 +31,10 @@ struct TaskDropDownView: View { } } else { Text("Create Tasks") + .frame(minWidth: 0) } } + .opacity(activeState == .inactive ? 0.4 : 1.0) .font(.subheadline) .padding(.trailing, 11.5) .padding(.horizontal, 2.5) diff --git a/CodeEdit/Features/ActivityViewer/Tasks/TaskView.swift b/CodeEdit/Features/ActivityViewer/Tasks/TaskView.swift index 92afa07260..26212d3583 100644 --- a/CodeEdit/Features/ActivityViewer/Tasks/TaskView.swift +++ b/CodeEdit/Features/ActivityViewer/Tasks/TaskView.swift @@ -18,6 +18,7 @@ struct TaskView: View { HStack(spacing: 5) { Image(systemName: "gearshape") Text(task.name) + .frame(minWidth: 0) Spacer(minLength: 0) } .padding(.trailing, 7.5) From c4999e2841f5640ace3f343fcf5f6cdb36e74753 Mon Sep 17 00:00:00 2001 From: Austin Condiff Date: Wed, 15 Jan 2025 22:36:19 -0600 Subject: [PATCH 2/3] Added inactive states to the start and stop task buttons --- CodeEdit/Features/Tasks/Views/StartTaskToolbarButton.swift | 4 ++++ CodeEdit/Features/Tasks/Views/StopTaskToolbarButton.swift | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/CodeEdit/Features/Tasks/Views/StartTaskToolbarButton.swift b/CodeEdit/Features/Tasks/Views/StartTaskToolbarButton.swift index 2d93152704..4ab7174746 100644 --- a/CodeEdit/Features/Tasks/Views/StartTaskToolbarButton.swift +++ b/CodeEdit/Features/Tasks/Views/StartTaskToolbarButton.swift @@ -8,6 +8,9 @@ import SwiftUI struct StartTaskToolbarButton: View { + @Environment(\.controlActiveState) + private var activeState + @UpdatingWindowController var windowController: CodeEditWindowController? @ObservedObject var taskManager: TaskManager @@ -28,6 +31,7 @@ struct StartTaskToolbarButton: View { } label: { Label("Start", systemImage: "play.fill") .labelStyle(.iconOnly) + .opacity(activeState == .inactive ? 0.5 : 1.0) .font(.system(size: 18, weight: .regular)) .help("Start selected task") .frame(width: 28) diff --git a/CodeEdit/Features/Tasks/Views/StopTaskToolbarButton.swift b/CodeEdit/Features/Tasks/Views/StopTaskToolbarButton.swift index 837a834b0b..559dbf0b77 100644 --- a/CodeEdit/Features/Tasks/Views/StopTaskToolbarButton.swift +++ b/CodeEdit/Features/Tasks/Views/StopTaskToolbarButton.swift @@ -9,6 +9,9 @@ import SwiftUI import Combine struct StopTaskToolbarButton: View { + @Environment(\.controlActiveState) + private var activeState + @ObservedObject var taskManager: TaskManager /// Tracks the current selected task's status. Updated by `updateStatusListener` @@ -25,6 +28,7 @@ struct StopTaskToolbarButton: View { } label: { Label("Stop", systemImage: "stop.fill") .labelStyle(.iconOnly) + .opacity(activeState == .inactive ? 0.5 : 1.0) .font(.system(size: 15, weight: .regular)) .help("Stop selected task") .frame(width: 28) From 06f62b584562617697f7978c7ec865e173371879 Mon Sep 17 00:00:00 2001 From: Austin Condiff Date: Wed, 15 Jan 2025 22:56:06 -0600 Subject: [PATCH 3/3] Fixed SwiftLint error --- CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift b/CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift index d2fd6ad979..c25a985d44 100644 --- a/CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift +++ b/CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift @@ -13,7 +13,7 @@ struct SchemeDropDownView: View { @Environment(\.controlActiveState) private var activeState - + @State var isSchemePopOverPresented: Bool = false @State private var isHoveringScheme: Bool = false