Updated Controls

Button is now default to Stretch as per standard Wpf Button Update for MessageBox Update for PasswordBox Update for TreeView
reactivemarbles · Aug 1, 2024 · 7847214 · 7847214
1 parent 611fdd6
commit 7847214
Show file tree

Hide file tree

Showing 9 changed files with 320 additions and 186 deletions.
diff --git a/Version.json b/Version.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "2.0.4",
+    "version": "2.0.5",
     "publicReleaseRefSpec": [
         "^refs/heads/master$",
         "^refs/heads/main$"

diff --git a/src/CrissCross.WPF.UI.Test/Views/Pages/DashboardPage.xaml b/src/CrissCross.WPF.UI.Test/Views/Pages/DashboardPage.xaml
@@ -86,6 +86,17 @@
             Grid.Row="3"
             Grid.Column="2"
             Height="312"
-            Source="/Assets/working.gif" AnimateInDesignMode="True" />
+            AnimateInDesignMode="True"
+            Source="/Assets/working.gif" />
+        <ui:TreeView
+            Grid.Row="3"
+            Grid.Column="4"
+            FontSize="24">
+            <ui:TreeViewItem FontSize="28" Header="Top">
+                <ui:TreeViewItem FontSize="32" Header="Middle">
+                    <ui:TreeViewItem FontSize="36" Header="Bottom" />
+                </ui:TreeViewItem>
+            </ui:TreeViewItem>
+        </ui:TreeView>
     </Grid>
 </Page>
diff --git a/src/CrissCross.WPF.UI/Controls/Button/Button.xaml b/src/CrissCross.WPF.UI/Controls/Button/Button.xaml
@@ -16,8 +16,8 @@
         <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource ButtonBorderThemeThickness}" />
         <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
@@ -85,8 +85,8 @@
         <Setter Property="MouseOverBorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource ButtonBorderThemeThickness}" />
         <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />