WinGui: Tighten up the UI for marginal displays and move the "Back" button on the...

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index bbd102584e5a7592fbfb71d67d97843cbf6cc9b3..2df373a0c0039ec5e1c62c1ec6234ea175971478 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -52,7 +52,7 @@
 \r
     </UserControl.Resources>\r
 \r
-    <Grid>\r
+    <Grid Margin="0,0,0,10">\r
         <Grid.ColumnDefinitions>\r
             <ColumnDefinition Width="150" />\r
             <ColumnDefinition Width="*" />\r
@@ -61,20 +61,23 @@
         <Grid.RowDefinitions>\r
             <RowDefinition Height="Auto" />\r
             <RowDefinition Height="*" />\r
-            <RowDefinition Height="Auto" />\r
         </Grid.RowDefinitions>\r
 \r
         <!-- Row 1 -->\r
-        <StackPanel  Grid.Row="0" Grid.ColumnSpan="2" Orientation="Horizontal">\r
+        <StackPanel  Grid.Row="0" Grid.ColumnSpan="2" Orientation="Vertical">\r
             <TextBlock Text="Preferences" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" Grid.ColumnSpan="2" />\r
-\r
         </StackPanel>\r
-        \r
+\r
         <Border BorderBrush="DarkGray"  Grid.Column="0" Grid.Row="1"  BorderThickness="0,0,1,0">\r
-            <StackPanel Orientation="Vertical" Margin="11,5,-1,0">\r
+\r
+            <StackPanel Orientation="Vertical" Margin="11,0,-1,0">\r
+\r
+\r
+                <Button Content="&#60; Back" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]" \r
+                            HorizontalAlignment="Left" Padding="12,2" Margin="0,0,0,10" FontWeight="Bold" />\r
 \r
                 <ListBox ItemsSource="{Binding Source={StaticResource OptionTabsList}, Converter={StaticResource optionTabConverter}}" SelectedItem="{Binding SelectedTab}"\r
-                     BorderThickness="0" Background="Transparent">\r
+                             BorderThickness="0" Background="Transparent">\r
                     <ListBox.ItemTemplate>\r
                         <DataTemplate>\r
                             <TextBlock Text="{Binding Converter={StaticResource tabNameConverter}}"/>\r
@@ -408,11 +411,6 @@
             </StackPanel>\r
         </ScrollViewer>\r
 \r
-        <StackPanel HorizontalAlignment="Stretch" Grid.Row="2" Grid.Column="0" >\r
-\r
-            <Button Content="&#60; Back" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]" \r
-                    HorizontalAlignment="Center" Padding="12,2" Margin="0,5,10,5" FontWeight="Bold" />\r
-        </StackPanel>\r
     </Grid>\r
 \r
 </UserControl>\r

diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml b/win/CS/HandBrakeWPF/Views/ShellView.xaml
index 409d4be6bcc43587d4dbedb22bdd255970ed82b2..e7a6feba65be4f14a81477cac2ccfd830fbe97af 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/ShellView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml
@@ -7,9 +7,9 @@
         xmlns:cal="http://www.caliburnproject.org"\r
         Title="{Data:Binding Path=MainViewModel.WindowTitle}"\r
         Width="1018"\r
-        Height="680"\r
+        Height="650"\r
         MinWidth="1018"\r
-        MinHeight="680"\r
+        MinHeight="650"\r
         AllowDrop="True"\r
         SnapsToDevicePixels="True"\r
         UseLayoutRounding="True"\r