dan/Toolkit2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI cleanup

Browse Source
This commit is contained in:
TheXamlGuy
2024-08-04 21:54:47 +01:00
parent f09c364ea7
commit b1a3375746
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Toolkit.UI.Controls.Avalonia/SettingsExpander/SettingsExpander.axaml
+10 -18
View File
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:Toolkit.UI.Controls.Avalonia" xmlns:controls="using:Toolkit.UI.Controls.Avalonia"
xmlns:ui="using:FluentAvalonia.UI.Controls"> xmlns:ui="using:FluentAvalonia.UI.Controls">
<Thickness x:Key="SettingsExpanderItemBottomFooterMargin">0,0,0,0</Thickness> <Thickness x:Key="SettingsExpanderItemBottomFooterMargin">0,4,0,0</Thickness>
<ControlTheme x:Key="SettingsExpanderToggleButtonStyle" TargetType="controls:SettingsExpanderToggleButton"> <ControlTheme x:Key="SettingsExpanderToggleButtonStyle" TargetType="controls:SettingsExpanderToggleButton">
<Setter Property="Background" Value="{DynamicResource ExpanderHeaderBackground}" /> <Setter Property="Background" Value="{DynamicResource ExpanderHeaderBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderBrush}" />
@@ -203,14 +203,15 @@
IsVisible="False"> IsVisible="False">
<ContentPresenter Content="{Binding TemplateSettings.Icon, RelativeSource={RelativeSource TemplatedParent}}" /> <ContentPresenter Content="{Binding TemplateSettings.Icon, RelativeSource={RelativeSource TemplatedParent}}" />
</Viewbox> </Viewbox>
<Grid <Grid
Grid.Column="1" Grid.Column="1"
VerticalAlignment="Center" VerticalAlignment="Center"
ColumnDefinitions="*,Auto"
RowDefinitions="Auto,Auto"> RowDefinitions="Auto,Auto">
<StackPanel <StackPanel
Name="HeaderRegion" Name="HeaderRegion"
Grid.Row="0" Grid.Row="0"
Grid.Column="0"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="Center"> VerticalAlignment="Center">
<ContentPresenter <ContentPresenter
@@ -229,17 +230,14 @@
<ContentPresenter <ContentPresenter
Name="FooterPresenter" Name="FooterPresenter"
Grid.Row="0" Grid.Row="0"
Grid.Column="2" Grid.Column="1"
Grid.ColumnSpan="1"
Margin="{DynamicResource SettingsExpanderItemFooterMargin}" Margin="{DynamicResource SettingsExpanderItemFooterMargin}"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Content="{TemplateBinding Footer}" Content="{TemplateBinding Footer}"
ContentTemplate="{TemplateBinding FooterTemplate}" ContentTemplate="{TemplateBinding FooterTemplate}"
IsVisible="False" /> IsVisible="False" />
</Grid> </Grid>
<ContentPresenter <ContentPresenter
Name="ActionPresenter" Name="ActionPresenter"
Grid.Column="2" Grid.Column="2"
@@ -270,6 +268,10 @@
<Setter Property="CornerRadius" Value="{Binding Source={StaticResource ControlCornerRadius}, Converter={StaticResource BottomCornerRadiusFilterConverter}}" /> <Setter Property="CornerRadius" Value="{Binding Source={StaticResource ControlCornerRadius}, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
</Style> </Style>
<Style Selector="^:footer /template/ StackPanel#HeaderRegion">
<Setter Property="Grid.RowSpan" Value="1" />
</Style>
<Style Selector="^:footer /template/ ContentPresenter#FooterPresenter"> <Style Selector="^:footer /template/ ContentPresenter#FooterPresenter">
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
</Style> </Style>
@@ -277,20 +279,11 @@
<Style Selector="^:footerBottom"> <Style Selector="^:footerBottom">
<Style Selector="^ /template/ ContentPresenter#FooterPresenter"> <Style Selector="^ /template/ ContentPresenter#FooterPresenter">
<Setter Property="Grid.Row" Value="1" /> <Setter Property="Grid.Row" Value="1" />
<Setter Property="Grid.Column" Value="1" /> <Setter Property="Grid.Column" Value="0" />
<Setter Property="Grid.ColumnSpan" Value="3" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Top" /> <Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="Margin" Value="{DynamicResource SettingsExpanderItemBottomFooterMargin}" /> <Setter Property="Margin" Value="{DynamicResource SettingsExpanderItemBottomFooterMargin}" />
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#ActionPresenter">
<Setter Property="Grid.Row" Value="0" />
<Setter Property="Grid.RowSpan" Value="2" />
</Style>
<Style Selector="^ /template/ ContentPresenter#IconPresenter">
<Setter Property="Grid.Row" Value="0" />
<Setter Property="Grid.RowSpan" Value="2" />
</Style>
</Style> </Style>
<Style Selector="^:actionIcon /template/ Viewbox#ActionIconHost"> <Style Selector="^:actionIcon /template/ Viewbox#ActionIconHost">
@@ -306,7 +299,6 @@
</Style> </Style>
<Style Selector="^:icon"> <Style Selector="^:icon">
<Style Selector="^ /template/ ContentPresenter#IconPresenter"> <Style Selector="^ /template/ ContentPresenter#IconPresenter">
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
</Style> </Style>