Skip to content

Commit 37de456

Browse files
zdpcdtzdpcdt
committed
fix: PointerOver -> Pointerover.
1 parent f92b5f4 commit 37de456

File tree

11 files changed

+41
-29
lines changed

11 files changed

+41
-29
lines changed

‎src/Semi.Avalonia.TreeDataGrid/Dark.axaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
22
<StaticResource x:Key="TreeDataGridGridLinesBrush" ResourceKey="SemiColorBorder" />
3-
<StaticResource x:Key="TreeDataGridHeaderPointerOverBackground" ResourceKey="SemiColorFill1" />
3+
<StaticResource x:Key="TreeDataGridHeaderPointeroverBackground" ResourceKey="SemiColorFill1" />
44
<StaticResource x:Key="TreeDataGridHeaderPressedBackground" ResourceKey="SemiColorFill2" />
5-
<SolidColorBrush x:Key="TreeDataGridHeaderPointerOverBorderBrush" Color="Transparent" />
5+
<SolidColorBrush x:Key="TreeDataGridHeaderPointeroverBorderBrush" Color="Transparent" />
66
<SolidColorBrush x:Key="TreeDataGridHeaderPressedBorderBrush" Color="Transparent" />
7-
<StaticResource x:Key="TreeDataGridHeaderPointerOverForeground" ResourceKey="SemiColorText1" />
7+
<StaticResource x:Key="TreeDataGridHeaderPointeroverForeground" ResourceKey="SemiColorText1" />
88
<StaticResource x:Key="TreeDataGridHeaderPressedForeground" ResourceKey="SemiColorText0" />
99
<StaticResource x:Key="TreeDataGridCellSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
1010
<StaticResource x:Key="TreeDataGridColumnHeaderForeground" ResourceKey="SemiColorText2" />

‎src/Semi.Avalonia.TreeDataGrid/Light.axaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
22
<StaticResource x:Key="TreeDataGridGridLinesBrush" ResourceKey="SemiColorBorder" />
3-
<StaticResource x:Key="TreeDataGridHeaderPointerOverBackground" ResourceKey="SemiColorFill1" />
3+
<StaticResource x:Key="TreeDataGridHeaderPointeroverBackground" ResourceKey="SemiColorFill1" />
44
<StaticResource x:Key="TreeDataGridHeaderPressedBackground" ResourceKey="SemiColorFill2" />
5-
<SolidColorBrush x:Key="TreeDataGridHeaderPointerOverBorderBrush" Color="Transparent" />
5+
<SolidColorBrush x:Key="TreeDataGridHeaderPointeroverBorderBrush" Color="Transparent" />
66
<SolidColorBrush x:Key="TreeDataGridHeaderPressedBorderBrush" Color="Transparent" />
7-
<StaticResource x:Key="TreeDataGridHeaderPointerOverForeground" ResourceKey="SemiColorText1" />
7+
<StaticResource x:Key="TreeDataGridHeaderPointeroverForeground" ResourceKey="SemiColorText1" />
88
<StaticResource x:Key="TreeDataGridHeaderPressedForeground" ResourceKey="SemiColorText0" />
99
<StaticResource x:Key="TreeDataGridCellSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
1010
<StaticResource x:Key="TreeDataGridColumnHeaderForeground" ResourceKey="SemiColorText2" />

‎src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@
113113
</Setter>
114114

115115
<Style Selector="^:pointerover /template/ Border#DataGridBorder">
116-
<Setter Property="Background" Value="{DynamicResource TreeDataGridHeaderPointerOverBackground}" />
117-
<Setter Property="BorderBrush" Value="{DynamicResource TreeDataGridHeaderPointerOverBorderBrush}" />
118-
<Setter Property="TextBlock.Foreground" Value="{DynamicResource TreeDataGridHeaderPointerOverForeground}" />
116+
<Setter Property="Background" Value="{DynamicResource TreeDataGridHeaderPointeroverBackground}" />
117+
<Setter Property="BorderBrush" Value="{DynamicResource TreeDataGridHeaderPointeroverBorderBrush}" />
118+
<Setter Property="TextBlock.Foreground" Value="{DynamicResource TreeDataGridHeaderPointeroverForeground}" />
119119
</Style>
120120

121121
<Style Selector="^:pressed /template/ Border#DataGridBorder">

‎src/Semi.Avalonia/Controls/CalendarDatePicker.axaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
<Setter Property="BorderBrush" Value="Transparent" />
172172
</Style>
173173
<Style Selector="^:pointerover /template/ Border#Background">
174-
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
174+
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
175175
<Setter Property="BorderBrush" Value="Transparent" />
176176
</Style>
177177
<Style Selector="^:pressed /template/ Border#Background">
@@ -213,8 +213,8 @@
213213
<Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsBorderBrush}" />
214214
</Style>
215215
<Style Selector="^:pointerover /template/ Border#Background">
216-
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
217-
<Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
216+
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
217+
<Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointeroverBorderBrush}" />
218218
</Style>
219219
<Style Selector="^:pressed /template/ Border#Background">
220220
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />

‎src/Semi.Avalonia/Controls/ComboBox.axaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsBackground}" />
218218
</Style>
219219
<Style Selector="^:pointerover /template/ Border#Background">
220-
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
220+
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
221221
<Setter Property="BorderBrush" Value="Transparent" />
222222
</Style>
223223
<Style Selector="^:pressed /template/ Border#Background">
@@ -273,8 +273,8 @@
273273
<Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsBorderBrush}" />
274274
</Style>
275275
<Style Selector="^:pointerover /template/ Border#Background">
276-
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
277-
<Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
276+
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
277+
<Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointeroverBorderBrush}" />
278278
</Style>
279279
<Style Selector="^:pressed /template/ Border#Background">
280280
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />

‎src/Semi.Avalonia/Controls/DateTimePickerShared.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<Setter Property="BorderBrush" Value="Transparent" />
3838
</Style>
3939
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
40-
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
40+
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
4141
<Setter Property="BorderBrush" Value="Transparent" />
4242
</Style>
4343
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">

‎src/Semi.Avalonia/Controls/NumericUpDown.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<Setter Property="BorderBrush" Value="Transparent" />
5858
</Style>
5959
<Style Selector="^:pointerover /template/ TextBox#PART_TextBox">
60-
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
60+
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
6161
<Setter Property="BorderBrush" Value="Transparent" />
6262
</Style>
6363
<Style Selector="^:pressed /template/ TextBox#PART_TextBox">

‎src/Semi.Avalonia/Controls/TextBox.axaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<Setter Property="BorderBrush" Value="Transparent" />
153153
</Style>
154154
<Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
155-
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
155+
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
156156
<Setter Property="BorderBrush" Value="Transparent" />
157157
</Style>
158158
<Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
@@ -210,8 +210,8 @@
210210
<Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsBorderBrush}" />
211211
</Style>
212212
<Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
213-
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
214-
<Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
213+
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
214+
<Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointeroverBorderBrush}" />
215215
</Style>
216216
<Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
217217
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
@@ -380,7 +380,7 @@
380380
<Setter Property="BorderBrush" Value="Transparent" />
381381
</Style>
382382
<Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
383-
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
383+
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
384384
<Setter Property="BorderBrush" Value="Transparent" />
385385
</Style>
386386
<Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
@@ -438,8 +438,8 @@
438438
<Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsBorderBrush}" />
439439
</Style>
440440
<Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
441-
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
442-
<Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
441+
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
442+
<Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointeroverBorderBrush}" />
443443
</Style>
444444
<Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
445445
<Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />

‎src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22
<StaticResource x:Key="DataValidationErrorsForeground" ResourceKey="SemiColorDanger" />
33
<StaticResource x:Key="DataValidationErrorsBackground" ResourceKey="SemiColorDangerLight" />
44
<StaticResource x:Key="DataValidationErrorsBorderBrush" ResourceKey="SemiColorDangerLight" />
5-
<StaticResource x:Key="DataValidationErrorsPointerOverBackground" ResourceKey="SemiColorDangerLightPointerover" />
6-
<StaticResource x:Key="DataValidationErrorsPointerOverBorderBrush" ResourceKey="SemiColorDangerLightPointerover" />
5+
<StaticResource x:Key="DataValidationErrorsPointeroverBackground" ResourceKey="SemiColorDangerLightPointerover" />
6+
<StaticResource x:Key="DataValidationErrorsPointeroverBorderBrush" ResourceKey="SemiColorDangerLightPointerover" />
77
<StaticResource x:Key="DataValidationErrorsPressedBackground" ResourceKey="SemiColorDangerLightActive" />
88
<StaticResource x:Key="DataValidationErrorsPressedBorderBrush" ResourceKey="SemiColorDangerLightActive" />
99
<StaticResource x:Key="DataValidationErrorsSelectedBackground" ResourceKey="SemiColorDangerLight" />
1010
<StaticResource x:Key="DataValidationErrorsSelectedBorderBrush" ResourceKey="SemiColorDanger" />
11+
12+
<!-- Deprecated keys -->
13+
<StaticResource x:Key="DataValidationErrorsPointerOverBackground" ResourceKey="SemiColorDangerLightPointerover" />
14+
<StaticResource x:Key="DataValidationErrorsPointerOverBorderBrush" ResourceKey="SemiColorDangerLightPointerover" />
1115
</ResourceDictionary>

‎src/Semi.Avalonia/Themes/HighContrast/DataValidationErrors.axaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22
<SolidColorBrush x:Key="DataValidationErrorsForeground" Color="#FC725A" />
33
<SolidColorBrush x:Key="DataValidationErrorsBackground" Opacity="0.2" Color="#FC725A" />
44
<SolidColorBrush x:Key="DataValidationErrorsBorderBrush" Opacity="0.2" Color="#FC725A" />
5-
<SolidColorBrush x:Key="DataValidationErrorsPointerOverBackground" Opacity="0.3" Color="#FC725A" />
6-
<SolidColorBrush x:Key="DataValidationErrorsPointerOverBorderBrush" Opacity="0.3" Color="#FC725A" />
5+
<SolidColorBrush x:Key="DataValidationErrorsPointeroverBackground" Opacity="0.3" Color="#FC725A" />
6+
<SolidColorBrush x:Key="DataValidationErrorsPointeroverBorderBrush" Opacity="0.3" Color="#FC725A" />
77
<SolidColorBrush x:Key="DataValidationErrorsPressedBackground" Opacity="0.4" Color="#FC725A" />
88
<SolidColorBrush x:Key="DataValidationErrorsPressedBorderBrush" Opacity="0.4" Color="#FC725A" />
99
<SolidColorBrush x:Key="DataValidationErrorsSelectedBackground" Opacity="0.2" Color="#FC725A" />
1010
<SolidColorBrush x:Key="DataValidationErrorsSelectedBorderBrush" Color="#FC725A" />
11+
12+
<!-- Deprecated keys -->
13+
<StaticResource x:Key="DataValidationErrorsPointerOverBackground" ResourceKey="SemiColorDangerLightPointerover" />
14+
<StaticResource x:Key="DataValidationErrorsPointerOverBorderBrush" ResourceKey="SemiColorDangerLightPointerover" />
1115
</ResourceDictionary>

0 commit comments

Comments
 (0)