chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: adapt inner icon theme.

Browse Source
This commit is contained in:
rabbitism
2024-12-08 17:34:11 +08:00
parent 9001322f87
commit e6115d2517
7 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Ursa.Demo/Ursa.Demo.csproj
View File

@@ -19,7 +19,7 @@
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.--> <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" /> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
<PackageReference Include="Semi.Avalonia" Version="11.2.1" /> <PackageReference Include="Semi.Avalonia" Version="11.2.1.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/Ursa.Themes.Semi/Controls/DatePicker.axaml
View File

@@ -60,7 +60,7 @@
<Button <Button
Name="PART_Button" Name="PART_Button"
Grid.Column="1" Grid.Column="1"
Padding="0,0,8,0" Margin="8 0"
IsVisible="{Binding !#ClearButton.IsVisible}" IsVisible="{Binding !#ClearButton.IsVisible}"
Content="{DynamicResource CalendarDatePickerIconGlyph}" Content="{DynamicResource CalendarDatePickerIconGlyph}"
Focusable="False" Focusable="False"

2
src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml
View File

@@ -67,7 +67,7 @@
<Button <Button
Name="{x:Static u:DateRangePicker.PART_Button}" Name="{x:Static u:DateRangePicker.PART_Button}"
Grid.Column="3" Grid.Column="3"
Padding="8,0" Margin="8,0"
Content="{DynamicResource CalendarDatePickerIconGlyph}" Content="{DynamicResource CalendarDatePickerIconGlyph}"
Focusable="False" Focusable="False"
IsVisible="{Binding !#ClearButton.IsVisible}" IsVisible="{Binding !#ClearButton.IsVisible}"

2
src/Ursa.Themes.Semi/Controls/DateTimePicker.axaml
View File

@@ -59,7 +59,7 @@
<Button <Button
Name="PART_Button" Name="PART_Button"
Grid.Column="1" Grid.Column="1"
Padding="0,0,8,0" Margin="8 0"
IsVisible="{Binding !#ClearButton.IsVisible}" IsVisible="{Binding !#ClearButton.IsVisible}"
Content="{DynamicResource DateTimePickerGlyph}" Content="{DynamicResource DateTimePickerGlyph}"
Focusable="False" Focusable="False"

3
src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
View File

@@ -51,9 +51,8 @@
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Text="{TemplateBinding Gesture, Text="{TemplateBinding Gesture,
Converter={StaticResource KeyGestureConverter}}" /> Converter={StaticResource KeyGestureConverter}}" />
<Button Grid.Column="0" Grid.ColumnSpan="3" <Button Grid.Column="1"
Name="PART_ClearButton" Name="PART_ClearButton"
Margin="0,0,8,0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Command="{Binding $parent[u:KeyGestureInput].Clear}" Command="{Binding $parent[u:KeyGestureInput].Clear}"
Content="{DynamicResource IconButtonClearData}" Content="{DynamicResource IconButtonClearData}"

8
src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
View File

@@ -84,12 +84,9 @@
<PathIcon <PathIcon
x:Name="DropDownGlyph" x:Name="DropDownGlyph"
Grid.Column="4" Grid.Column="4"
Width="12"
Height="12"
Margin="0,0,10,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
IsVisible="{Binding #ClearButton.IsVisible, Converter={x:Static BoolConverters.Not}}" IsVisible="{Binding #ClearButton.IsVisible, Converter={x:Static BoolConverters.Not}}"
Theme="{DynamicResource InnerPathIcon}"
Width="{DynamicResource ComboBoxIconWidth}"
Data="{DynamicResource ComboBoxIcon}" Data="{DynamicResource ComboBoxIcon}"
Foreground="{DynamicResource ComboBoxIconDefaultForeground}" Foreground="{DynamicResource ComboBoxIconDefaultForeground}"
IsHitTestVisible="False" IsHitTestVisible="False"
@@ -232,6 +229,7 @@
Grid.Column="0" Grid.Column="0"
Width="{DynamicResource CheckBoxBoxGlyphWidth}" Width="{DynamicResource CheckBoxBoxGlyphWidth}"
Height="{DynamicResource CheckBoxBoxGlyphHeight}" Height="{DynamicResource CheckBoxBoxGlyphHeight}"
Theme="{DynamicResource InnerPathIcon}"
Margin="8,0" Margin="8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Data="{DynamicResource CheckBoxCheckGlyph}" Data="{DynamicResource CheckBoxCheckGlyph}"

5
src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
View File

@@ -88,11 +88,10 @@
<PathIcon <PathIcon
x:Name="DropDownGlyph" x:Name="DropDownGlyph"
Grid.Column="3" Grid.Column="3"
Width="12" Margin="8 0"
Height="12"
Margin="0,0,12,0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Theme="{DynamicResource InnerPathIcon}"
Data="{DynamicResource ComboBoxIcon}" Data="{DynamicResource ComboBoxIcon}"
Foreground="{DynamicResource ComboBoxIconDefaultForeground}" Foreground="{DynamicResource ComboBoxIconDefaultForeground}"
IsHitTestVisible="True" IsHitTestVisible="True"