Merge branch 'development' of github.com:lepoco/wpfui into development

lepoco · Oct 9, 2023 · 63eed2f · 63eed2f
2 parents 93ef22f + ede2da1
commit 63eed2f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/src/Wpf.Ui/Controls/FluentWindow/FluentWindow.cs b/src/Wpf.Ui/Controls/FluentWindow/FluentWindow.cs
@@ -97,10 +97,6 @@ public FluentWindow()
     static FluentWindow()
     {
         DefaultStyleKeyProperty.OverrideMetadata(typeof(FluentWindow), new FrameworkPropertyMetadata(typeof(FluentWindow)));
-        HeightProperty.OverrideMetadata(typeof(FluentWindow), new FrameworkPropertyMetadata(600d));
-        WidthProperty.OverrideMetadata(typeof(FluentWindow), new FrameworkPropertyMetadata(1100d));
-        MinHeightProperty.OverrideMetadata(typeof(FluentWindow), new FrameworkPropertyMetadata(320d));
-        MinWidthProperty.OverrideMetadata(typeof(FluentWindow), new FrameworkPropertyMetadata(460d));
     }
 
     /// <inheritdoc />

diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationLeftFluent.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationLeftFluent.xaml
@@ -50,7 +50,7 @@
                     <Grid
                         x:Name="ContentGrid"
                         Grid.Row="1"
-                        Height="15"
+                        Height="{StaticResource NavigationViewFluentIconSize}"
                         Margin="0,2,0,0">
                         <ContentPresenter
                             x:Name="ElementContentPresenter"
@@ -82,7 +82,7 @@
                             <DoubleAnimation
                                 Storyboard.TargetName="ContentGrid"
                                 Storyboard.TargetProperty="Height"
-                                From="15"
+                                From="{StaticResource NavigationViewFluentIconSize}"
                                 To="0"
                                 Duration="0:0:.16" />
                             <DoubleAnimation
@@ -107,7 +107,7 @@
                                 Storyboard.TargetName="ContentGrid"
                                 Storyboard.TargetProperty="Height"
                                 From="0"
-                                To="15"
+                                To="{StaticResource NavigationViewFluentIconSize}"
                                 Duration="0:0:.16" />
                             <DoubleAnimation
                                 Storyboard.TargetName="ContentGrid"

diff --git a/src/Wpf.Ui/Controls/TreeView/TreeViewItem.xaml b/src/Wpf.Ui/Controls/TreeView/TreeViewItem.xaml
@@ -84,8 +84,6 @@
                 <SolidColorBrush Opacity="0.0" Color="{DynamicResource ControlFillColorDefault}" />
             </Setter.Value>
         </Setter>
-        <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-        <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="Padding" Value="4" />
         <Setter Property="FontSize" Value="{StaticResource TreeViewItemFontSize}" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
@@ -211,8 +209,6 @@
                 <SolidColorBrush Opacity="0.0" Color="{DynamicResource ControlFillColorDefault}" />
             </Setter.Value>
         </Setter>
-        <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-        <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="Padding" Value="4" />
         <Setter Property="FocusVisualStyle" Value="{StaticResource TreeViewItemFocusVisual}" />
         <Setter Property="OverridesDefaultStyle" Value="True" />