use theme background (#1004)

* use theme background

* reorder CodeEditTextView arg list

* bump CodeEditTextView from 0.3.3 to 0.3.4

* add use theme background terminal preference

Author: neil-ptr

CodeEdit.xcodeproj/project.pbxproj

@@ -3806,7 +3806,7 @@
 			repositoryURL = "https://github.com/CodeEditApp/CodeEditTextView.git";
 			requirement = {
 				kind = exactVersion;
-				version = 0.3.3;
+				version = 0.3.4;
 			};
 		};
 		58F2EB18292FB91C004A9BDE /* XCRemoteSwiftPackageReference "Preferences" */ = {

CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -15,6 +15,9 @@ extension AppPreferences {
         /// If true terminal appearance will always be `dark`. Otherwise it adapts to the system setting.
         var darkAppearance: Bool = false
 
+        /// if true, the terminal uses the background color of the theme, otherwise it is clear
+        var useThemeBackground: Bool = true
+
         /// If true, the terminal treats the `Option` key as the `Meta` key
         var optionAsMeta: Bool = false
 

CodeEdit/Features/AppPreferences/Model/Terminal/TerminalPreferences.swift

@@ -35,6 +35,7 @@ struct TerminalThemeView: View {
     private var topToggles: some View {
         VStack(alignment: .leading) {
             Toggle("Always use dark terminal appearance", isOn: $prefs.preferences.terminal.darkAppearance)
+            Toggle("Use theme background ", isOn: $prefs.preferences.terminal.useThemeBackground)
         }
     }
 

CodeEdit/Features/AppPreferences/Sections/ThemePreferences/TerminalThemeView.swift

@@ -69,10 +69,26 @@ struct CodeFileView: View {
             tabWidth: $prefs.preferences.textEditing.defaultTabWidth,
             lineHeight: $prefs.preferences.textEditing.lineHeightMultiple,
             wrapLines: $prefs.preferences.textEditing.wrapLinesToEditorWidth,
-            cursorPosition: codeFile.$cursorPosition
+            cursorPosition: codeFile.$cursorPosition,
+            useThemeBackground: prefs.preferences.theme.useThemeBackground
         )
         .id(codeFile.fileURL)
-        .background(selectedTheme.editor.background.swiftColor)
+        .background {
+            if colorScheme == .dark {
+                if prefs.preferences.theme.selectedTheme == prefs.preferences.theme.selectedLightTheme {
+                    Color.white
+                } else {
+                    EffectView(.underPageBackground)
+                }
+            } else {
+                if prefs.preferences.theme.selectedTheme == prefs.preferences.theme.selectedDarkTheme {
+                    Color.black
+                } else {
+                    EffectView(.contentBackground)
+                }
+
+            }
+        }
         .disabled(!editable)
         .frame(maxHeight: .infinity)
         .onChange(of: ThemeModel.shared.selectedTheme) { newValue in

CodeEdit/Features/CodeFile/CodeFileView.swift

@@ -11,6 +11,12 @@ struct StatusBarDrawer: View {
     @EnvironmentObject
     private var model: StatusBarViewModel
 
+    @ObservedObject
+    private var prefs: AppPreferencesModel = .shared
+
+    @Environment(\.colorScheme)
+    private var colorScheme
+
     @State
     private var searchText = ""
 
@@ -27,7 +33,24 @@ struct StatusBarDrawer: View {
     var body: some View {
         VStack(spacing: 0) {
             switch model.selectedTab {
-            case 0: TerminalEmulatorView(url: model.workspaceURL)
+            case 0:
+                TerminalEmulatorView(url: model.workspaceURL)
+                    .background {
+                        if colorScheme == .dark {
+                            if prefs.preferences.theme.selectedTheme == prefs.preferences.theme.selectedLightTheme {
+                                Color.white
+                            } else {
+                                EffectView(.underPageBackground)
+                            }
+                        } else {
+                            if prefs.preferences.theme.selectedTheme == prefs.preferences.theme.selectedDarkTheme {
+                                Color.black
+                            } else {
+                                EffectView(.contentBackground)
+                            }
+
+                        }
+                    }
             default: Rectangle().foregroundColor(Color(nsColor: .textBackgroundColor))
             }
             HStack(alignment: .center, spacing: 10) {

CodeEdit/Features/StatusBar/Views/StatusBarDrawer/StatusBarDrawer.swift

@@ -175,7 +175,8 @@ struct TerminalEmulatorView: NSViewRepresentable {
             terminal.caretColor = cursorColor
             terminal.selectedTextBackgroundColor = selectionColor
             terminal.nativeForegroundColor = textColor
-            terminal.nativeBackgroundColor = backgroundColor
+            terminal.nativeBackgroundColor = prefs.preferences.terminal.useThemeBackground ? backgroundColor : .clear
+            terminal.layer?.backgroundColor = .clear
             terminal.optionAsMetaKey = optionAsMeta
         }
         terminal.appearance = colorAppearance
@@ -201,7 +202,8 @@ struct TerminalEmulatorView: NSViewRepresentable {
         view.caretColor = cursorColor
         view.selectedTextBackgroundColor = selectionColor
         view.nativeForegroundColor = textColor
-        view.nativeBackgroundColor = backgroundColor
+        view.nativeBackgroundColor = prefs.preferences.terminal.useThemeBackground ? backgroundColor : .clear
+        view.layer?.backgroundColor = .clear
         view.optionAsMetaKey = optionAsMeta
         view.appearance = colorAppearance
         if TerminalEmulatorView.lastTerminal[url.path] != nil {