Adjust Settings window so that content expands as it resizes #193
Conversation
| <RowDefinition Height="Auto" /> | ||
| <RowDefinition Height="Auto" /> | ||
| <RowDefinition Height="25" /> | ||
| <RowDefinition Height="50" /> | ||
| <RowDefinition Height="Auto" /> |
There was a problem hiding this comment.
Removed, as the stuff inside the ScrollViewer is no longer part of this Grid.
| <Border Grid.Row="0" BorderBrush="{DynamicResource HighlightBrush}" BorderThickness="0 0 0 2" Grid.ColumnSpan="2"> | ||
| <Menu Name="menuBar" KeyboardNavigation.TabNavigation="None"> | ||
| <Image Source="/Assets/icon.ico" Stretch="None"/> | ||
| <TextBlock Text="{i18n:Translate ui.window.settings.name}" Margin="-10 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="{DynamicResource ThemeForegroundBrush}" /> | ||
| </Menu> | ||
| </Border> | ||
| <Menu Name="windowMenu" IsVisible="{Binding ShowMainMenu}" HorizontalAlignment="Right" KeyboardNavigation.TabNavigation="None" Grid.Column="1"> | ||
| <Menu Name="windowMenu" Grid.Row="0" IsVisible="{Binding ShowMainMenu}" HorizontalAlignment="Right" KeyboardNavigation.TabNavigation="None" Grid.Column="1"> |
There was a problem hiding this comment.
Not strictly necessary, because any item without a Grid.Row set is implicitly 0, but this makes things more consistent.
| <Button Name="exitButton" i:Attached.Icon="mdi-close" Margin="0 0 -10 0" Foreground="{DynamicResource ThemeForegroundBrush}" Background="Transparent"/> | ||
| </Menu> | ||
|
|
||
| <ScrollViewer AllowAutoHide="True" Height="350" Grid.Row="1" Grid.ColumnSpan="2"> | ||
| <ScrollViewer AllowAutoHide="True" Grid.Row="1" Grid.ColumnSpan="2"> |
There was a problem hiding this comment.
Removed the explicit height, which will allow the ScrollViewer to expand to fit its container.
| <StackPanel> | ||
| <StackPanel Grid.Row="1" Grid.ColumnSpan="2" Margin="10 10 0 0"> | ||
| <StackPanel Margin="10 10 0 0"> |
There was a problem hiding this comment.
This, and all of the other children inside the StackPanel are no longer part of a Grid (and never were, actually), so don't need this.
| <Button Name="cancelButton" IsCancel="True" ToolTip.Tip="{Binding ToolTip_Cancel}" i:Attached.Icon="mdi-cancel" Margin="0 0 15 0" BorderBrush="{DynamicResource HighlightBrush}" Foreground="Red" Background="Transparent" HorizontalAlignment="Right"/> | ||
| </DockPanel> | ||
| <Border Grid.Row="2" Grid.ColumnSpan="2" BorderBrush="{DynamicResource HighlightBrush}" BorderThickness="0 0 0 2" Height="4"/> | ||
| <Grid Grid.Row="3" Grid.ColumnSpan="2" RowDefinitions="Auto, Auto" ColumnDefinitions="Auto, Auto" HorizontalAlignment="Right" Margin="0 15 0 15"> |
There was a problem hiding this comment.
Little container grid, to hold the two buttons. This probably could have just been a StackPanel with a Horizontal Orientation too, but ¯\_(ツ)_/¯
|
This is great! Thank you for getting that menu fixed up. I made a minor adjustment to have the height of If that change looks good to you, I will merge it over. |
|
I'd just pass in the desired EDIT: oh, dang and you might want to remove the explicit |
|
Good idea on both points! I have added those changes and merged it over. Thank you for the pull request! |
Minor fix, unrelated to my other PR. Allows the Settings window's content to expand vertically, along with the window.
Note: the
Heightset inSettingsWindow.axamlgets ignored becauseSizeToContentis set toSizeToContent.Height. If we want the window to open up to the height of500as set, we'll need to remove that from the constructor.