WinGui: Allow the Title Dropdown to grow in width where it makes sense. #1499

1 files changed, 29 insertions, 20 deletions

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 2bc3929cc..80951e814 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -319,14 +319,19 @@
                     <TextBlock Text="{Binding SourceInfo}" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="DimGray" Grid.Column="2" Margin="10,0,0,0" MaxWidth="360" />

                 </Grid>

 

-                <StackPanel Orientation="Horizontal" Grid.Row="1" Margin="0,5,0,0">

-                    <Label FontWeight="Bold" Content="{x:Static Properties:ResourcesUI.MainView_Title}" />

-                    <ComboBox Name="Titles"

-                             Width="100"

-                             Margin="17,0,0,0"

-                             ItemsSource="{Binding ScannedSource.Titles}"

-                             ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Title}"

-                             SelectedItem="{Binding Path=SelectedTitle}" >

+                <Grid Grid.Row="1" Margin="0,5,5,0">

+                    <Grid.ColumnDefinitions>

+                        <ColumnDefinition Width="Auto" />

+                        <ColumnDefinition Width="*" MaxWidth="272" />

+                        <ColumnDefinition Width="Auto" />

+                    </Grid.ColumnDefinitions>

+

+                    <Label FontWeight="Bold" Content="{x:Static Properties:ResourcesUI.MainView_Title}"  Grid.Column="0"  />

+                    <ComboBox Name="Titles"  Grid.Column="1" 

+                              MinWidth="100" Margin="17,0,0,0"

+                              ItemsSource="{Binding ScannedSource.Titles}"

+                              ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Title}"

+                              SelectedItem="{Binding Path=SelectedTitle}" >

 

                         <ComboBox.Style>

                             <Style TargetType="{x:Type ComboBox}">

@@ -341,22 +346,23 @@
                             </Style>

                         </ComboBox.Style>

                     </ComboBox>

-                    <Label Margin="5,0,0,0" FontWeight="Bold" Content="{x:Static Properties:ResourcesUI.MainView_Angle}" />

+                    <StackPanel Orientation="Horizontal" Grid.Column="2" >

+                        <Label Margin="5,0,0,0" FontWeight="Bold" Content="{x:Static Properties:ResourcesUI.MainView_Angle}" />

 

-                    <ComboBox Name="Angles"

+                        <ComboBox Name="Angles"

                                   MinWidth="60"

                                   Margin="2,0,0,0"

                                   ItemsSource="{Binding Angles}"

                                   SelectedItem="{Binding SelectedAngle}"

                                   ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Angle}" />

 

-                    <Label Margin="2,0,0,0" FontWeight="Bold" Content="{x:Static Properties:ResourcesUI.MainView_Range}" />

-                    <ComboBox Name="PointToPointMode"

+                        <Label Margin="2,0,0,0" FontWeight="Bold" Content="{x:Static Properties:ResourcesUI.MainView_Range}" />

+                        <ComboBox Name="PointToPointMode"

                                   MinWidth="80"

                                   Margin="5,0,0,0"

                                   ItemsSource="{Binding RangeMode}" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Range}"

                                   SelectedItem="{Binding SelectedPointToPoint}" />

-                    <ComboBox Name="StartPoint"

+                        <ComboBox Name="StartPoint"

                                   MinWidth="60"

                                   Margin="5,0,0,0"

                                   ItemsSource="{Binding StartEndRangeItems}"

@@ -365,15 +371,15 @@
                                   Visibility="{Binding ShowTextEntryForPointToPointMode,

                                                        Converter={StaticResource boolToVisConverter},

                                                        ConverterParameter=true}" />

-                    <Controls:TimeSpanBox  Number="{Binding SelectedStartPoint, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"

+                        <Controls:TimeSpanBox  Number="{Binding SelectedStartPoint, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"

                                                Minimum="0" AllowEmpty="False" ShowTimeSpan="{Binding IsTimespanRange}"

                                                ToolTip="{x:Static Properties:ResourcesTooltips.MainView_StartPoint}"

                                                MinWidth="72" Margin="5,0,0,0"  Visibility="{Binding ShowTextEntryForPointToPointMode,

                                                        Converter={StaticResource boolToVisConverter},

                                                        ConverterParameter=false}" />

 

-                    <Label Margin="4,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_through}" />

-                    <ComboBox Name="EndPoint"

+                        <Label Margin="4,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_through}" />

+                        <ComboBox Name="EndPoint"

                                   MinWidth="60"

                                   Margin="4,0,0,0"

                                   ItemsSource="{Binding StartEndRangeItems}"

@@ -382,17 +388,20 @@
                                   Visibility="{Binding ShowTextEntryForPointToPointMode,

                                                        Converter={StaticResource boolToVisConverter},

                                                        ConverterParameter=true}" />

-                    <Controls:TimeSpanBox  Number="{Binding SelectedEndPoint, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"

+                        <Controls:TimeSpanBox  Number="{Binding SelectedEndPoint, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"

                                                Minimum="0" AllowEmpty="False" ShowTimeSpan="{Binding IsTimespanRange}"

                                                ToolTip="{x:Static Properties:ResourcesTooltips.MainView_EndPoint}"

                                                MinWidth="72" Margin="5,0,0,0"  Visibility="{Binding ShowTextEntryForPointToPointMode,

                                                        Converter={StaticResource boolToVisConverter},

                                                        ConverterParameter=false}" />

 

-                    <Label Margin="2,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_Duration}" FontWeight="Bold" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Duration}" />

-                    <Label Margin="0,0,0,0" Content="{Binding Duration}" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Duration}" />

+                        <Label Margin="2,0,0,0" Content="{x:Static Properties:ResourcesUI.MainView_Duration}" FontWeight="Bold" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Duration}" />

+                        <Label Margin="0,0,0,0" Content="{Binding Duration}" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Duration}" />

 

-                </StackPanel>

+                    </StackPanel>

+                </Grid>

+

+              

             </Grid>

 

             <!--  Presets Options  -->