diff options
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/OptionsView.xaml | 22 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/ShellView.xaml | 4 |
2 files changed, 12 insertions, 14 deletions
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml index bbd102584..2df373a0c 100644 --- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml +++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml @@ -52,7 +52,7 @@ </UserControl.Resources>
- <Grid>
+ <Grid Margin="0,0,0,10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="150" />
<ColumnDefinition Width="*" />
@@ -61,20 +61,23 @@ <Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
- <RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!-- Row 1 -->
- <StackPanel Grid.Row="0" Grid.ColumnSpan="2" Orientation="Horizontal">
+ <StackPanel Grid.Row="0" Grid.ColumnSpan="2" Orientation="Vertical">
<TextBlock Text="Preferences" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" Grid.ColumnSpan="2" />
-
</StackPanel>
-
+
<Border BorderBrush="DarkGray" Grid.Column="0" Grid.Row="1" BorderThickness="0,0,1,0">
- <StackPanel Orientation="Vertical" Margin="11,5,-1,0">
+
+ <StackPanel Orientation="Vertical" Margin="11,0,-1,0">
+
+
+ <Button Content="< Back" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"
+ HorizontalAlignment="Left" Padding="12,2" Margin="0,0,0,10" FontWeight="Bold" />
<ListBox ItemsSource="{Binding Source={StaticResource OptionTabsList}, Converter={StaticResource optionTabConverter}}" SelectedItem="{Binding SelectedTab}"
- BorderThickness="0" Background="Transparent">
+ BorderThickness="0" Background="Transparent">
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Converter={StaticResource tabNameConverter}}"/>
@@ -408,11 +411,6 @@ </StackPanel>
</ScrollViewer>
- <StackPanel HorizontalAlignment="Stretch" Grid.Row="2" Grid.Column="0" >
-
- <Button Content="< Back" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"
- HorizontalAlignment="Center" Padding="12,2" Margin="0,5,10,5" FontWeight="Bold" />
- </StackPanel>
</Grid>
</UserControl>
diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml b/win/CS/HandBrakeWPF/Views/ShellView.xaml index 409d4be6b..e7a6feba6 100644 --- a/win/CS/HandBrakeWPF/Views/ShellView.xaml +++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml @@ -7,9 +7,9 @@ xmlns:cal="http://www.caliburnproject.org"
Title="{Data:Binding Path=MainViewModel.WindowTitle}"
Width="1018"
- Height="680"
+ Height="650"
MinWidth="1018"
- MinHeight="680"
+ MinHeight="650"
AllowDrop="True"
SnapsToDevicePixels="True"
UseLayoutRounding="True"
|