Fixed Variable framerate radio button sometimes being cut off when th…

…e Windows text size is increased.
RandomEngy · Apr 8, 2023 · 1d86306 · 1d86306
1 parent 9a274d0
commit 1d86306
Showing 1 changed file with 33 additions and 69 deletions.
diff --git a/VidCoder/View/Panels/VideoPanel.xaml b/VidCoder/View/Panels/VideoPanel.xaml
@@ -22,7 +22,7 @@
 	</UserControl.Resources>
 	<Grid>
 		<Grid.RowDefinitions>
-			<RowDefinition Height="185" />
+			<RowDefinition Height="Auto" />
 			<RowDefinition />
 		</Grid.RowDefinitions>
 		<!--  Top row  -->
@@ -189,8 +189,7 @@
 							VerticalAlignment="Top"
 							Content="{Binding VfrChoiceText}"
 							GroupName="constantFramerate2"
-							IsChecked="{Binding ConstantFramerate,
-							                    Converter={StaticResource InverseBoolConverter}}">
+							IsChecked="{Binding ConstantFramerate, Converter={StaticResource InverseBoolConverter}}">
 							<RadioButton.ToolTip>
 								<TextBlock Style="{StaticResource LongToolTip}" Text="{Binding VariableFramerateToolTip}" />
 							</RadioButton.ToolTip>
@@ -233,9 +232,7 @@
 							VerticalAlignment="Center"
 							Content="{x:Static res:EncodingRes.TargetSizeRadioButton}"
 							GroupName="VideoQuality"
-							IsChecked="{Binding VideoEncodeRateType,
-							                    Converter={StaticResource EnumBoolConverter},
-							                    ConverterParameter={x:Static model:VCVideoEncodeRateType.TargetSize}}" />
+							IsChecked="{Binding VideoEncodeRateType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static model:VCVideoEncodeRateType.TargetSize}}" />
 						<controls:NumberBox
 							Grid.Row="0"
 							Grid.Column="1"
@@ -246,17 +243,12 @@
 							VerticalAlignment="Center"
 							AllowEmpty="False"
 							AutomationProperties.Name="{x:Static res:EncodingRes.TargetSizeRadioButton}"
-							IsEnabled="{Binding VideoEncodeRateType,
-							                    Converter={StaticResource EnumBoolConverter},
-							                    ConverterParameter={x:Static model:VCVideoEncodeRateType.TargetSize}}"
+							IsEnabled="{Binding VideoEncodeRateType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static model:VCVideoEncodeRateType.TargetSize}}"
 							Minimum="0"
 							Modulus="0.1"
-							Number="{Binding TargetSize,
-							                 Mode=TwoWay}"
+							Number="{Binding TargetSize, Mode=TwoWay}"
 							ShowIncrementButtons="False"
-							Visibility="{Binding VideoEncodeRateType,
-							                     Converter={StaticResource EnumVisibilityInverseConverter},
-							                     ConverterParameter={x:Static model:VCVideoEncodeRateType.ConstantQuality}}" />
+							Visibility="{Binding VideoEncodeRateType, Converter={StaticResource EnumVisibilityInverseConverter}, ConverterParameter={x:Static model:VCVideoEncodeRateType.ConstantQuality}}" />
 
 						<RadioButton
 							Grid.Row="1"
@@ -266,9 +258,7 @@
 							VerticalAlignment="Center"
 							Content="{x:Static res:EncodingRes.AverageBitrateRadioButton}"
 							GroupName="VideoQuality"
-							IsChecked="{Binding VideoEncodeRateType,
-							                    Converter={StaticResource EnumBoolConverter},
-							                    ConverterParameter={x:Static model:VCVideoEncodeRateType.AverageBitrate}}" />
+							IsChecked="{Binding VideoEncodeRateType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static model:VCVideoEncodeRateType.AverageBitrate}}" />
 						<controls:NumberBox
 							Grid.Row="1"
 							Grid.Column="1"
@@ -279,16 +269,11 @@
 							VerticalAlignment="Center"
 							AllowEmpty="False"
 							AutomationProperties.Name="{x:Static res:EncodingRes.AverageBitrateRadioButton}"
-							IsEnabled="{Binding VideoEncodeRateType,
-							                    Converter={StaticResource EnumBoolConverter},
-							                    ConverterParameter={x:Static model:VCVideoEncodeRateType.AverageBitrate}}"
+							IsEnabled="{Binding VideoEncodeRateType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static model:VCVideoEncodeRateType.AverageBitrate}}"
 							Minimum="100"
-							Number="{Binding VideoBitrate,
-							                 Mode=TwoWay}"
+							Number="{Binding VideoBitrate, Mode=TwoWay}"
 							ShowIncrementButtons="False"
-							Visibility="{Binding VideoEncodeRateType,
-							                     Converter={StaticResource EnumVisibilityInverseConverter},
-							                     ConverterParameter={x:Static model:VCVideoEncodeRateType.ConstantQuality}}" />
+							Visibility="{Binding VideoEncodeRateType, Converter={StaticResource EnumVisibilityInverseConverter}, ConverterParameter={x:Static model:VCVideoEncodeRateType.ConstantQuality}}" />
 
 						<RadioButton
 							Grid.Row="2"
@@ -298,9 +283,7 @@
 							VerticalAlignment="Center"
 							Content="{x:Static res:EncodingRes.ConstantQualityRadioButton}"
 							GroupName="VideoQuality"
-							IsChecked="{Binding VideoEncodeRateType,
-							                    Converter={StaticResource EnumBoolConverter},
-							                    ConverterParameter={x:Static model:VCVideoEncodeRateType.ConstantQuality}}">
+							IsChecked="{Binding VideoEncodeRateType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static model:VCVideoEncodeRateType.ConstantQuality}}">
 							<RadioButton.ToolTip>
 								<TextBlock Style="{StaticResource LargeToolTip}" Text="{x:Static res:EncodingRes.Video_QualityTargetToolTip}" />
 							</RadioButton.ToolTip>
@@ -309,9 +292,7 @@
 							Grid.Row="2"
 							Grid.Column="1"
 							Orientation="Horizontal"
-							Visibility="{Binding VideoEncodeRateType,
-							                     Converter={StaticResource EnumVisibilityConverter},
-							                     ConverterParameter={x:Static model:VCVideoEncodeRateType.ConstantQuality}}">
+							Visibility="{Binding VideoEncodeRateType, Converter={StaticResource EnumVisibilityConverter}, ConverterParameter={x:Static model:VCVideoEncodeRateType.ConstantQuality}}">
 							<controls:NumberBox
 								Width="49"
 								Height="23"
@@ -323,8 +304,7 @@
 								Maximum="51"
 								Minimum="0"
 								Modulus="{Binding QualityModulus}"
-								Number="{Binding Quality,
-								                 Mode=TwoWay}">
+								Number="{Binding Quality, Mode=TwoWay}">
 								<controls:NumberBox.ToolTip>
 									<TextBlock Style="{StaticResource LargeToolTip}" Text="{x:Static res:EncodingRes.Video_QualityTargetToolTip}" />
 								</controls:NumberBox.ToolTip>
@@ -343,8 +323,7 @@
 						VerticalAlignment="Top"
 						Content="{x:Static res:EncodingRes.TwoPassEncodingCheckBox}"
 						IsChecked="{Binding TwoPass}"
-						Visibility="{Binding TwoPassVisible,
-						                     Converter={StaticResource VisibilityConverter}}" />
+						Visibility="{Binding TwoPassVisible, Converter={StaticResource VisibilityConverter}}" />
 					<CheckBox
 						Grid.Column="1"
 						Margin="36 26 0 0"
@@ -353,8 +332,7 @@
 						Content="{x:Static res:EncodingRes.TurboFirstPassCheckBox}"
 						IsChecked="{Binding TurboFirstPass}"
 						IsEnabled="{Binding TurboFirstPassEnabled}"
-						Visibility="{Binding TurboFirstPassVisible,
-						                     Converter={StaticResource VisibilityConverter}}" />
+						Visibility="{Binding TurboFirstPassVisible, Converter={StaticResource VisibilityConverter}}" />
 				</Grid>
 
 
@@ -368,9 +346,7 @@
 					Minimum="{Binding QualitySliderMin}"
 					TickFrequency="1"
 					TickPlacement="BottomRight"
-					Visibility="{Binding VideoEncodeRateType,
-					                     Converter={StaticResource EnumVisibilityConverter},
-					                     ConverterParameter={x:Static model:VCVideoEncodeRateType.ConstantQuality}}"
+					Visibility="{Binding VideoEncodeRateType, Converter={StaticResource EnumVisibilityConverter}, ConverterParameter={x:Static model:VCVideoEncodeRateType.ConstantQuality}}"
 					Value="{Binding Quality}">
 					<Slider.ToolTip>
 						<TextBlock Style="{StaticResource LargeToolTip}" Text="{x:Static res:EncodingRes.Video_QualityTargetToolTip}" />
@@ -383,25 +359,24 @@
 					VerticalAlignment="Top"
 					Text="{Binding QualitySliderLeftText}"
 					TextAlignment="Left"
-					Visibility="{Binding VideoEncodeRateType,
-					                     Converter={StaticResource EnumVisibilityConverter},
-					                     ConverterParameter={x:Static model:VCVideoEncodeRateType.ConstantQuality}}" />
+					Visibility="{Binding VideoEncodeRateType, Converter={StaticResource EnumVisibilityConverter}, ConverterParameter={x:Static model:VCVideoEncodeRateType.ConstantQuality}}" />
 				<TextBlock
 					Height="21"
 					Margin="0 132 6 0"
 					HorizontalAlignment="Right"
 					VerticalAlignment="Top"
 					Text="{Binding QualitySliderRightText}"
 					TextAlignment="Right"
-					Visibility="{Binding VideoEncodeRateType,
-					                     Converter={StaticResource EnumVisibilityConverter},
-					                     ConverterParameter={x:Static model:VCVideoEncodeRateType.ConstantQuality}}" />
+					Visibility="{Binding VideoEncodeRateType, Converter={StaticResource EnumVisibilityConverter}, ConverterParameter={x:Static model:VCVideoEncodeRateType.ConstantQuality}}" />
 
 			</Grid>
 		</Grid>
 
 		<!--  Encoder settings  -->
-		<Grid Grid.Row="1" Style="{StaticResource LongToolTipHolder}">
+		<Grid
+			Grid.Row="1"
+			Margin="0 12 0 0"
+			Style="{StaticResource LongToolTipHolder}">
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto" />
 				<RowDefinition />
@@ -425,8 +400,7 @@
 					Margin="0 7 10 0"
 					HorizontalAlignment="Stretch"
 					VerticalAlignment="Top"
-					Visibility="{Binding PresetVisible,
-					                     Converter={StaticResource VisibilityConverter}}">
+					Visibility="{Binding PresetVisible, Converter={StaticResource VisibilityConverter}}">
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition />
@@ -448,8 +422,7 @@
 						Minimum="0"
 						Style="{StaticResource LongToolTipHolder}"
 						TickPlacement="BottomRight"
-						Value="{Binding PresetIndex,
-						                Mode=TwoWay}" />
+						Value="{Binding PresetIndex, Mode=TwoWay}" />
 					<TextBlock
 						Grid.Column="2"
 						MinWidth="150"
@@ -471,8 +444,7 @@
 							VerticalAlignment="Top"
 							Orientation="Horizontal"
 							Style="{StaticResource LongToolTipHolder}"
-							Visibility="{Binding TuneVisible,
-							                     Converter={StaticResource VisibilityConverter}}">
+							Visibility="{Binding TuneVisible, Converter={StaticResource VisibilityConverter}}">
 							<StackPanel.ToolTip>
 								<TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static res:EncodingRes.X264TuneToolTip}" />
 							</StackPanel.ToolTip>
@@ -499,8 +471,7 @@
 							VerticalAlignment="Top"
 							Orientation="Horizontal"
 							Style="{StaticResource LongToolTipHolder}"
-							Visibility="{Binding ProfileVisible,
-							                     Converter={StaticResource VisibilityConverter}}">
+							Visibility="{Binding ProfileVisible, Converter={StaticResource VisibilityConverter}}">
 							<StackPanel.ToolTip>
 								<TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static res:EncodingRes.ProfileToolTip}" />
 							</StackPanel.ToolTip>
@@ -527,8 +498,7 @@
 							VerticalAlignment="Top"
 							Orientation="Horizontal"
 							Style="{StaticResource LongToolTipHolder}"
-							Visibility="{Binding LevelVisible,
-							                     Converter={StaticResource VisibilityConverter}}">
+							Visibility="{Binding LevelVisible, Converter={StaticResource VisibilityConverter}}">
 							<StackPanel.ToolTip>
 								<TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static res:EncodingRes.LevelToolTip}" />
 							</StackPanel.ToolTip>
@@ -568,16 +538,14 @@
 								VerticalAlignment="Top"
 								Content="{x:Static res:EncodingRes.Tune_fastdecode}"
 								IsChecked="{Binding FastDecode}"
-								Visibility="{Binding TuneVisible,
-								                     Converter={StaticResource VisibilityConverter}}" />
+								Visibility="{Binding TuneVisible, Converter={StaticResource VisibilityConverter}}" />
 							<CheckBox
 								MinWidth="120"
 								Margin="0 8 0 0"
 								VerticalAlignment="Top"
 								Content="{x:Static res:EncodingRes.QsvDecodingLabel}"
 								IsChecked="{Binding QsvDecode}"
-								Visibility="{Binding QsvSettingsVisible,
-								                     Converter={StaticResource VisibilityConverter}}" />
+								Visibility="{Binding QsvSettingsVisible, Converter={StaticResource VisibilityConverter}}" />
 						</StackPanel>
 
 
@@ -606,8 +574,7 @@
 								Grid.Row="0"
 								Grid.Column="1"
 								AutomationProperties.LabeledBy="{Binding ElementName=moreSettingsLabel}"
-								Text="{Binding VideoOptions,
-								               UpdateSourceTrigger=PropertyChanged}"
+								Text="{Binding VideoOptions, UpdateSourceTrigger=PropertyChanged}"
 								TextWrapping="Wrap"
 								ToolTip="{x:Static res:EncodingRes.MoreOptionsToolTip}" />
 
@@ -617,19 +584,16 @@
 								Margin="0 4 6 0"
 								VerticalAlignment="Center"
 								Text="{x:Static res:EncodingRes.FullEncoderParameterLabel}"
-								Visibility="{Binding X264SettingsVisible,
-								                     Converter={StaticResource VisibilityConverter}}" />
+								Visibility="{Binding X264SettingsVisible, Converter={StaticResource VisibilityConverter}}" />
 							<TextBox
 								Grid.Row="1"
 								Grid.Column="1"
 								Margin="0 4 0 0"
 								Background="{DynamicResource AlternateBackgroundBrush}"
 								IsReadOnly="True"
-								Text="{Binding FullParameterList,
-								               Mode=OneWay}"
+								Text="{Binding FullParameterList, Mode=OneWay}"
 								TextWrapping="Wrap"
-								Visibility="{Binding X264SettingsVisible,
-								                     Converter={StaticResource VisibilityConverter}}" />
+								Visibility="{Binding X264SettingsVisible, Converter={StaticResource VisibilityConverter}}" />
 						</Grid>
 					</Grid>
 				</Grid>