Skip to content

Commit d94bf62

Browse files
authored
Add more brand tokens for mac ColorProviding (#2274)
1 parent 1bbcb85 commit d94bf62

2 files changed

Lines changed: 13 additions & 0 deletions

File tree

Demos/FluentUIDemo_macOS/FluentUITestViewControllers/TestColorProvider.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,12 @@ class TestColorProvider: ColorProviding {
2222
var brandBackground2: NSColor = (NSColor(named: "Colors/DemoBrandBackground2Color"))!
2323
var brandBackground2Hover: NSColor = (NSColor(named: "Colors/DemoBrandBackground2HoverColor"))!
2424
var brandBackground2Pressed: NSColor = (NSColor(named: "Colors/DemoBrandBackground2PressedColor"))!
25+
var brandBackgroundTint: NSColor = (NSColor(named: "Colors/DemoBrandBackground2Color"))!
2526

2627
var brandForeground1: NSColor = (NSColor(named: "Colors/DemoBrandForeground1Color"))!
28+
var brandForegroundTint: NSColor = (NSColor(named: "Colors/DemoBrandForeground1Color"))!
29+
30+
var brandStroke1: NSColor = (NSColor(named: "Colors/DemoBrandBackground1Color"))!
2731

2832
var primary: NSColor = (NSColor(named: "Colors/DemoPrimaryColor"))!
2933
var primaryShade10: NSColor = (NSColor(named: "Colors/DemoPrimaryShade10Color"))!

Sources/FluentUI_macOS/Core/ColorProviding.swift

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,16 @@ public protocol ColorProviding {
2626
@objc var brandBackground2: NSColor { get }
2727
@objc var brandBackground2Hover: NSColor { get }
2828
@objc var brandBackground2Pressed: NSColor { get }
29+
@objc var brandBackgroundTint: NSColor { get }
2930

3031
// MARK: - Brand Foreground Colors
3132

3233
@objc var brandForeground1: NSColor { get }
34+
@objc var brandForegroundTint: NSColor { get }
35+
36+
// MARK: - Brand Stroke Colors
37+
38+
@objc var brandStroke1: NSColor { get }
3339

3440
// MARK: - Legacy Brand Colors (kept for backward compatibility)
3541

@@ -55,7 +61,10 @@ func brandColorOverrides(provider: ColorProviding) -> [FluentTheme.ColorToken: C
5561
brandColors[.brandBackground2] = Color(provider.brandBackground2)
5662
brandColors[.brandBackground2Hover] = Color(provider.brandBackground2Hover)
5763
brandColors[.brandBackground2Pressed] = Color(provider.brandBackground2Pressed)
64+
brandColors[.brandBackgroundTint] = Color(provider.brandBackgroundTint)
5865
brandColors[.brandForeground1] = Color(provider.brandForeground1)
66+
brandColors[.brandForegroundTint] = Color(provider.brandForegroundTint)
67+
brandColors[.brandStroke1] = Color(provider.brandStroke1)
5968

6069
return brandColors
6170
}

0 commit comments

Comments
 (0)