Resize the Group Styles panel in Preferences window (#13099)

* Resize the Group Styles panel in Preferences window * Address extra spacing issues
DynamoDS · Jul 13, 2022 · b0694a9 · b0694a9
1 parent 2600beb
commit b0694a9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
@@ -3609,7 +3609,7 @@
                                 Grid.Row="1"
                                 BorderThickness="1,0,1,1"
                                 CornerRadius="0,0,4,4">
-                            <ContentPresenter Margin="12,0,0,15" />
+                            <ContentPresenter Margin="12,0,0,12" />
                         </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
@@ -4830,7 +4830,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ListBoxItem">
-                    <Grid Margin="0,0,10,10"
+                    <Grid Margin="0,0,10,5"
                                   MinWidth="186"
                                   MinHeight="67">
                         <Border x:Name="mouseOverBorder"

diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
@@ -18,7 +18,7 @@
         WindowStartupLocation="CenterOwner"
         WindowStyle="None"
         mc:Ignorable="d" 
-        Height="474" 
+        Height="480" 
         Width="665"
         ResizeMode="NoResize">
 
@@ -39,8 +39,7 @@
 
             <!--This Template will be used for the controls generated in the Styles list when a new Style is saved-->
             <DataTemplate x:Key="styleViewItemTemplate">
-                <Border Background="{StaticResource PreferencesWindowVisualSettingsAddStyleBackground}"     
-                        Margin="4"
+                <Border Background="{StaticResource PreferencesWindowVisualSettingsAddStyleBackground}"
                         BorderThickness="1">
                     <Grid>
                         <Grid.ColumnDefinitions>
@@ -535,8 +534,8 @@
                                 <ScrollViewer VerticalScrollBarVisibility="Auto" 
                                               x:Name="GroupStyleScrollViewer"                                              
                                               PreviewMouseWheel="ScrollViewer_PreviewMouseWheel"
-                                              Height="220">
-                                    <Grid Margin="0,0,0,0">
+                                              MaxHeight="260">
+                                    <Grid Margin="0,0,0,-2">
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="Auto" />
                                             <RowDefinition Height="Auto" />
@@ -548,7 +547,7 @@
                                                 Grid.Row="0"
                                                 MinWidth="100"
                                                 MinHeight="25"
-                                                Margin="3,10,0,10"
+                                                Margin="0,5,0,5"
                                                 Click="AddStyleButton_Click"
                                                 IsEnabled="{Binding IsEnabledAddStyleButton}"
                                                 Content="{x:Static p:Resources.AddStyleButton}" />
@@ -557,7 +556,7 @@
                                                 CornerRadius="4" 
                                                 MinHeight="100"
                                                 MinWidth="335"
-                                                Margin="7,0,72,10"
+                                                Margin="3,0,72,5"
                                                 Background="{StaticResource PreferencesWindowVisualSettingsAddStyleBackground}"
                                                 Grid.Row="1">
                                             <Grid>