Skip to content

Commit b92a3a0

Browse files
fix: maximized button color issue (#1607)
* fix: maximized button color issue * Update CodeEdit/Features/UtilityArea/Views/UtilityAreaView.swift Co-authored-by: Austin Condiff <austin.condiff@gmail.com> * Update CodeEdit/Features/UtilityArea/Views/UtilityAreaView.swift Co-authored-by: Austin Condiff <austin.condiff@gmail.com> * Update CodeEdit/Features/UtilityArea/Views/UtilityAreaView.swift Co-authored-by: Austin Condiff <austin.condiff@gmail.com> * fix: remove unused code * fix: remove duplicate modifiers in icon style --------- Co-authored-by: Austin Condiff <austin.condiff@gmail.com>
1 parent 6361a88 commit b92a3a0

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

CodeEdit/Features/UtilityArea/Views/UtilityAreaView.swift

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,19 @@
88
import SwiftUI
99

1010
struct UtilityAreaView: View {
11+
@AppSettings(\.theme.matchAppearance)
12+
private var matchAppearance
13+
14+
@AppSettings(\.terminal.darkAppearance)
15+
private var darkAppearance
16+
1117
@Environment(\.colorScheme)
1218
private var colorScheme
1319

1420
@EnvironmentObject private var model: UtilityAreaViewModel
1521

22+
@StateObject private var themeModel: ThemeModel = .shared
23+
1624
@State var selection: UtilityAreaTab? = .terminal
1725

1826
var body: some View {
@@ -43,6 +51,13 @@ struct UtilityAreaView: View {
4351
.buttonStyle(.icon(isActive: model.isMaximized, size: 24))
4452
}
4553
}
54+
.colorScheme(
55+
model.selectedTerminals.isEmpty
56+
? colorScheme
57+
: matchAppearance && darkAppearance
58+
? themeModel.selectedDarkTheme?.appearance == .dark ? .dark : .light
59+
: themeModel.selectedTheme?.appearance == .dark ? .dark : .light
60+
)
4661
.padding(.horizontal, 5)
4762
.padding(.vertical, 8)
4863
.frame(maxHeight: 27)

0 commit comments

Comments
 (0)