Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: maximized button color issue #1607

Merged
merged 6 commits into from
Mar 9, 2024
Merged

fix: maximized button color issue #1607

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ce8016
fix: maximized button color issue
phlpsong Mar 9, 2024
3514212
Update CodeEdit/Features/UtilityArea/Views/UtilityAreaView.swift
phlpsong Mar 9, 2024
2600a13
Update CodeEdit/Features/UtilityArea/Views/UtilityAreaView.swift
phlpsong Mar 9, 2024
20479c8
Update CodeEdit/Features/UtilityArea/Views/UtilityAreaView.swift
phlpsong Mar 9, 2024
62c8e66
fix: remove unused code
phlpsong Mar 9, 2024
eb874c4
fix: remove duplicate modifiers in icon style
phlpsong Mar 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions CodeEdit/Features/UtilityArea/Views/UtilityAreaView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,19 @@
import SwiftUI

struct UtilityAreaView: View {
@AppSettings(\.theme.matchAppearance)
private var matchAppearance

@AppSettings(\.terminal.darkAppearance)
private var darkAppearance

@Environment(\.colorScheme)
private var colorScheme

@EnvironmentObject private var model: UtilityAreaViewModel

@StateObject private var themeModel: ThemeModel = .shared

@State var selection: UtilityAreaTab? = .terminal

var body: some View {
Expand Down Expand Up @@ -43,6 +51,13 @@ struct UtilityAreaView: View {
.buttonStyle(.icon(isActive: model.isMaximized, size: 24))
}
}
.colorScheme(
model.selectedTerminals.isEmpty
? colorScheme
: matchAppearance && darkAppearance
? themeModel.selectedDarkTheme?.appearance == .dark ? .dark : .light
: themeModel.selectedTheme?.appearance == .dark ? .dark : .light
)
austincondiff marked this conversation as resolved.
Show resolved Hide resolved
.padding(.horizontal, 5)
.padding(.vertical, 8)
.frame(maxHeight: 27)
Expand Down
Loading