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

fix: fix inner icon theme Margin.

Browse Source
This commit is contained in:
Zhang Dian
2024-12-09 16:06:39 +08:00
parent e6115d2517
commit 91b02a8e39
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@
<Button <Button
Name="ClearButton" Name="ClearButton"
Grid.Column="1" Grid.Column="1"
Padding="0,0,8,0" Margin="8,0"
Command="{Binding $parent[u:DatePicker].Clear}" Command="{Binding $parent[u:DatePicker].Clear}"
Content="{DynamicResource IconButtonClearData}" Content="{DynamicResource IconButtonClearData}"
Focusable="False" Focusable="False"
@@ -60,7 +60,7 @@
<Button <Button
Name="PART_Button" Name="PART_Button"
Grid.Column="1" Grid.Column="1"
Margin="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

@@ -58,7 +58,7 @@
<Button <Button
Name="ClearButton" Name="ClearButton"
Grid.Column="3" Grid.Column="3"
Padding="8,0" Margin="8,0"
Command="{Binding $parent[u:DateRangePicker].Clear}" Command="{Binding $parent[u:DateRangePicker].Clear}"
Content="{DynamicResource IconButtonClearData}" Content="{DynamicResource IconButtonClearData}"
Focusable="False" Focusable="False"

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

@@ -50,7 +50,7 @@
<Button <Button
Name="ClearButton" Name="ClearButton"
Grid.Column="1" Grid.Column="1"
Padding="0,0,8,0" Margin="8 0"
Command="{Binding $parent[u:DateTimePicker].Clear}" Command="{Binding $parent[u:DateTimePicker].Clear}"
Content="{DynamicResource IconButtonClearData}" Content="{DynamicResource IconButtonClearData}"
Focusable="False" Focusable="False"

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

@@ -26,7 +26,7 @@
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<Grid Name="PART_RootGrid" ColumnDefinitions="Auto, *, Auto, Auto, 32"> <Grid Name="PART_RootGrid" ColumnDefinitions="Auto, *, Auto, Auto, Auto">
<Border <Border
Name="{x:Static u:MultiComboBox.PART_BackgroundBorder}" Name="{x:Static u:MultiComboBox.PART_BackgroundBorder}"
Grid.Column="0" Grid.Column="0"
@@ -94,6 +94,7 @@
<Button <Button
Name="ClearButton" Name="ClearButton"
Grid.Column="4" Grid.Column="4"
Width="{DynamicResource ComboBoxIconWidth}"
Command="{Binding $parent[u:MultiComboBox].Clear}" Command="{Binding $parent[u:MultiComboBox].Clear}"
Content="{DynamicResource IconButtonClearData}" Content="{DynamicResource IconButtonClearData}"
IsVisible="False" IsVisible="False"

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

@@ -79,7 +79,7 @@
<Button <Button
Name="PART_ClearButton" Name="PART_ClearButton"
Grid.Column="3" Grid.Column="3"
Margin="0,0,8,0" Margin="8 0"
Command="{Binding $parent[u:TreeComboBox].Clear}" Command="{Binding $parent[u:TreeComboBox].Clear}"
Content="{DynamicResource IconButtonClearData}" Content="{DynamicResource IconButtonClearData}"
IsVisible="False" IsVisible="False"