Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resize the Group Styles panel in Preferences window #13099

Merged
merged 2 commits into from
Jul 13, 2022
Merged

Resize the Group Styles panel in Preferences window #13099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4790c60
Resize the Group Styles panel in Preferences window
reddyashish Jul 11, 2022
12b19e4
Address extra spacing issues
reddyashish Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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"
Expand Down
13 changes: 6 additions & 7 deletions src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
WindowStartupLocation="CenterOwner"
WindowStyle="None"
mc:Ignorable="d"
Height="474"
Height="480"
Width="665"
ResizeMode="NoResize">

Expand All @@ -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>
Expand Down Expand Up @@ -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" />
Expand All @@ -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}" />
Expand All @@ -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>
Expand Down