Skip to content

Commit b30c4db

Browse files
apmanapman
authored
Remove styling-dependance on the presence of a window at the root (#63)
1 parent 053ae74 commit b30c4db

9 files changed

+96
-38
lines changed

‎src/MacOS.Avalonia.Theme/Accents/Styles.axaml

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<Styles xmlns="https://github.com/avaloniaui"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
33

4+
<!-- FontFamily should be inherited from Window normally. Adding this for RDM where the views are embedded into the native app without a Window -->
5+
<Style Selector="TextBox">
6+
<Setter Property="FontFamily" Value="{StaticResource MacOsThemeFontFamily}" />
7+
</Style>
8+
49
<Style Selector="Menu.MacOS_Theme_MenuOpensAbove > MenuItem > Border > Panel > Popup">
510
<Setter Property="Placement" Value="TopEdgeAlignedLeft" />
611
<Setter Property="VerticalOffset" Value="{DynamicResource MenuPopupAboveVerticalOffset}" />

‎src/MacOS.Avalonia.Theme/Accents/ThemeResources.axaml

+1
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@
200200

201201

202202
<!-- TODO: Appkit buttons have DD at the bottom, EE at the top & fading -> try sub-pixel rendering (UseLayoutRounding) (s. `default button issues.psd` ... -->
203+
<FontFamily x:Key="MacOsThemeFontFamily">Inter, Helvetica Neue, Segoe UI, SF Pro, sans-serif</FontFamily>
203204

204205
<LinearGradientBrush x:Key="ControlBackgroundRecessedBrush" StartPoint="0%,0%" EndPoint="0%,100%">
205206
<GradientStop Offset="0" Color="{DynamicResource ControlBorderLowColor}" />

‎src/MacOS.Avalonia.Theme/Controls/Button.axaml

+9-6
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,30 @@
3939
<Setter Property="Background">
4040
<Setter.Value>
4141
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
42-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
43-
<Binding Source="{StaticResource ControlBackgroundAccentRaisedBrush}" />
42+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
43+
Converter="{x:Static BoolConverters.Not}" />
4444
<Binding Source="{StaticResource ControlBackgroundHighBrush}" />
45+
<Binding Source="{StaticResource ControlBackgroundAccentRaisedBrush}" />
4546
</MultiBinding>
4647
</Setter.Value>
4748
</Setter>
4849
<Setter Property="Foreground">
4950
<Setter.Value>
5051
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
51-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
52-
<Binding Source="{StaticResource ControlForegroundAccentHighBrush}" />
52+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
53+
Converter="{x:Static BoolConverters.Not}" />
5354
<Binding Source="{StaticResource ForegroundHighBrush}" />
55+
<Binding Source="{StaticResource ControlForegroundAccentHighBrush}" />
5456
</MultiBinding>
5557
</Setter.Value>
5658
</Setter>
5759
<Setter Property="BorderBrush">
5860
<Setter.Value>
5961
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
60-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
61-
<Binding Source="{StaticResource ButtonBorderAccentBrush}" />
62+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
63+
Converter="{x:Static BoolConverters.Not}" />
6264
<Binding Source="{StaticResource ControlBorderRaisedBrush}" />
65+
<Binding Source="{StaticResource ButtonBorderAccentBrush}" />
6366
</MultiBinding>
6467
</Setter.Value>
6568
</Setter>

‎src/MacOS.Avalonia.Theme/Controls/CheckBox.axaml

+18-12
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,10 @@
6464
Stretch="Fill">
6565
<Path.Fill>
6666
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
67-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
68-
<Binding Source="{StaticResource ControlForegroundAccentHighBrush}" />
67+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
68+
Converter="{x:Static BoolConverters.Not}" />
6969
<Binding Source="{StaticResource ControlForegroundAccentInactiveHighBrush}" />
70+
<Binding Source="{StaticResource ControlForegroundAccentHighBrush}" />
7071
</MultiBinding>
7172
</Path.Fill>
7273
</Path>
@@ -79,9 +80,10 @@
7980
Stretch="Uniform">
8081
<Rectangle.Fill>
8182
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
82-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
83-
<Binding Source="{StaticResource ControlForegroundAccentHighBrush}" />
83+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
84+
Converter="{x:Static BoolConverters.Not}" />
8485
<Binding Source="{StaticResource ControlForegroundAccentInactiveHighBrush}" />
86+
<Binding Source="{StaticResource ControlForegroundAccentHighBrush}" />
8587
</MultiBinding>
8688
</Rectangle.Fill>
8789
</Rectangle>
@@ -112,19 +114,21 @@
112114
<Setter Property="Background">
113115
<Setter.Value>
114116
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
115-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
116-
<Binding Source="{StaticResource ControlBackgroundAccentRaisedBrush}" />
117+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
118+
Converter="{x:Static BoolConverters.Not}" />
117119
<Binding Source="{StaticResource ControlBackgroundHighBrush}" />
120+
<Binding Source="{StaticResource ControlBackgroundAccentRaisedBrush}" />
118121
</MultiBinding>
119122
</Setter.Value>
120123
</Setter>
121124
<Style Selector="^/template/ Border#border">
122125
<Setter Property="BorderBrush">
123126
<Setter.Value>
124127
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
125-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
126-
<Binding Source="{StaticResource ControlBorderAccentBrush}" />
128+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
129+
Converter="{x:Static BoolConverters.Not}" />
127130
<Binding Source="{StaticResource ControlBorderBrush}" />
131+
<Binding Source="{StaticResource ControlBorderAccentBrush}" />
128132
</MultiBinding>
129133
</Setter.Value>
130134
</Setter>
@@ -138,19 +142,21 @@
138142
<Setter Property="Background">
139143
<Setter.Value>
140144
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
141-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
142-
<Binding Source="{StaticResource ControlBackgroundAccentRaisedBrush}" />
145+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
146+
Converter="{x:Static BoolConverters.Not}" />
143147
<Binding Source="{StaticResource ControlBackgroundHighBrush}" />
148+
<Binding Source="{StaticResource ControlBackgroundAccentRaisedBrush}" />
144149
</MultiBinding>
145150
</Setter.Value>
146151
</Setter>
147152
<Style Selector="^/template/ Border#border">
148153
<Setter Property="BorderBrush">
149154
<Setter.Value>
150155
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
151-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
152-
<Binding Source="{StaticResource ControlBorderAccentBrush}" />
156+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
157+
Converter="{x:Static BoolConverters.Not}" />
153158
<Binding Source="{StaticResource ControlBorderBrush}" />
159+
<Binding Source="{StaticResource ControlBorderAccentBrush}" />
154160
</MultiBinding>
155161
</Setter.Value>
156162
</Setter>

‎src/MacOS.Avalonia.Theme/Controls/ComboBox.axaml

+12-8
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,20 @@
3737
<Setter Property="Background">
3838
<Setter.Value>
3939
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
40-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
41-
<Binding Source="{StaticResource ControlBackgroundAccentRaisedBrush}" />
40+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
41+
Converter="{x:Static BoolConverters.Not}" />
4242
<Binding Source="{StaticResource ControlBackgroundHighBrush}" />
43+
<Binding Source="{StaticResource ControlBackgroundAccentRaisedBrush}" />
4344
</MultiBinding>
4445
</Setter.Value>
4546
</Setter>
4647
<Setter Property="BorderBrush">
4748
<Setter.Value>
4849
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
49-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
50-
<Binding Source="{StaticResource ControlBorderAccentBrush}" />
50+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
51+
Converter="{x:Static BoolConverters.Not}" />
5152
<Binding Source="{StaticResource ControlBorderBrush}" />
53+
<Binding Source="{StaticResource ControlBorderAccentBrush}" />
5254
</MultiBinding>
5355
</Setter.Value>
5456
</Setter>
@@ -138,9 +140,10 @@
138140
Stretch="Uniform">
139141
<Path.Fill>
140142
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
141-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
142-
<Binding Source="{StaticResource ControlForegroundAccentHighBrush}" />
143+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
144+
Converter="{x:Static BoolConverters.Not}" />
143145
<Binding Source="{StaticResource ControlForegroundAccentInactiveHighBrush}" />
146+
<Binding Source="{StaticResource ControlForegroundAccentHighBrush}" />
144147
</MultiBinding>
145148
</Path.Fill>
146149
</Path>
@@ -152,9 +155,10 @@
152155
Stretch="Uniform">
153156
<Path.Fill>
154157
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
155-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
156-
<Binding Source="{StaticResource ControlForegroundAccentHighBrush}" />
158+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
159+
Converter="{x:Static BoolConverters.Not}" />
157160
<Binding Source="{StaticResource ControlForegroundAccentInactiveHighBrush}" />
161+
<Binding Source="{StaticResource ControlForegroundAccentHighBrush}" />
158162
</MultiBinding>
159163
</Path.Fill>
160164
<Path.RenderTransform>

‎src/MacOS.Avalonia.Theme/Controls/DataGrid.axaml

+9-6
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,14 @@
103103
<Setter Property="Foreground">
104104
<Setter.Value>
105105
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
106-
<MultiBinding Converter="{x:Static BoolConverters.And}">
107-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=DataGridRow}" Path="IsSelected" />
108-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
106+
<MultiBinding Converter="{x:Static BoolConverters.Or}">
107+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=DataGridRow}" Path="IsSelected"
108+
Converter="{x:Static BoolConverters.Not}" />
109+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
110+
Converter="{x:Static BoolConverters.Not}" />
109111
</MultiBinding>
110-
<Binding Source="{StaticResource DataGridForegroundSelectedBrush}" />
111112
<Binding Source="{StaticResource ForegroundHighBrush}" />
113+
<Binding Source="{StaticResource DataGridForegroundSelectedBrush}" />
112114
</MultiBinding>
113115
</Setter.Value>
114116
</Setter>
@@ -414,9 +416,10 @@
414416
<Setter Property="Background">
415417
<Setter.Value>
416418
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
417-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
418-
<Binding Source="{StaticResource DataGridItemBackgroundSelected}" />
419+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
420+
Converter="{x:Static BoolConverters.Not}" />
419421
<Binding Source="{StaticResource SelectionInActiveWindow}" />
422+
<Binding Source="{StaticResource DataGridItemBackgroundSelected}" />
420423
</MultiBinding>
421424
</Setter.Value>
422425
</Setter>

‎src/MacOS.Avalonia.Theme/Controls/TreeViewItem.axaml

+9-6
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,10 @@
127127
<Setter Property="Background">
128128
<Setter.Value>
129129
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
130-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
131-
<Binding Source="{StaticResource TreeViewItemBackgroundSelected}" />
130+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
131+
Converter="{x:Static BoolConverters.Not}" />
132132
<Binding Source="{StaticResource SelectionInActiveWindow}" />
133+
<Binding Source="{StaticResource TreeViewItemBackgroundSelected}" />
133134
</MultiBinding>
134135
</Setter.Value>
135136
</Setter>
@@ -139,9 +140,10 @@
139140
<Setter Property="Foreground">
140141
<Setter.Value>
141142
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
142-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
143-
<Binding Source="{StaticResource TreeViewItemForegroundSelected}" />
143+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
144+
Converter="{x:Static BoolConverters.Not}" />
144145
<Binding Source="{StaticResource ForegroundHighBrush}" />
146+
<Binding Source="{StaticResource TreeViewItemForegroundSelected}" />
145147
</MultiBinding>
146148
</Setter.Value>
147149
</Setter>
@@ -150,9 +152,10 @@
150152
<Setter Property="Foreground">
151153
<Setter.Value>
152154
<MultiBinding Converter="{StaticResource BooleanToChoiceConverter}">
153-
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive" />
154-
<Binding Source="{StaticResource TreeViewItemForegroundSelected}" />
155+
<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType=Window}" Path="IsActive"
156+
Converter="{x:Static BoolConverters.Not}" />
155157
<Binding Source="{StaticResource ForegroundHighBrush}" />
158+
<Binding Source="{StaticResource TreeViewItemForegroundSelected}" />
156159
</MultiBinding>
157160
</Setter.Value>
158161
</Setter>

‎src/MacOS.Avalonia.Theme/Controls/Window.axaml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<ResourceDictionary xmlns="https://github.com/avaloniaui"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
4+
<ControlTheme x:Key="{x:Type Window}" TargetType="Window">
5+
<Setter Property="Background" Value="{DynamicResource SystemRegionBrush}" />
6+
<Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource SystemControlBackgroundAltHighBrush}" />
7+
<Setter Property="TopLevel.SystemBarColor" Value="{DynamicResource SystemControlBackgroundAltHighBrush}" />
8+
<Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
9+
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
10+
<Setter Property="FontFamily" Value="{StaticResource MacOsThemeFontFamily}" />
11+
<Setter Property="Template">
12+
<ControlTemplate>
13+
<Panel>
14+
<Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
15+
<Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
16+
<Panel Background="Transparent" Margin="{TemplateBinding WindowDecorationMargin}" />
17+
<VisualLayerManager>
18+
<VisualLayerManager.ChromeOverlayLayer>
19+
<TitleBar />
20+
</VisualLayerManager.ChromeOverlayLayer>
21+
<ContentPresenter Name="PART_ContentPresenter"
22+
ContentTemplate="{TemplateBinding ContentTemplate}"
23+
Content="{TemplateBinding Content}"
24+
Margin="{TemplateBinding Padding}"
25+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
26+
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
27+
</VisualLayerManager>
28+
</Panel>
29+
</ControlTemplate>
30+
</Setter>
31+
</ControlTheme>
32+
</ResourceDictionary>

‎src/MacOS.Avalonia.Theme/Controls/_index.axaml

+1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@
2222
<MergeResourceInclude Source="ToolTip.axaml" />
2323
<MergeResourceInclude Source="TreeView.axaml" />
2424
<MergeResourceInclude Source="TreeViewItem.axaml" />
25+
<MergeResourceInclude Source="Window.axaml" />
2526
</ResourceDictionary.MergedDictionaries>
2627
</ResourceDictionary>

0 commit comments

Comments
 (0)