diff options
Diffstat (limited to 'win/CS')
| -rw-r--r-- | win/CS/Controls/PictureSettings.cs | 19 | ||||
| -rw-r--r-- | win/CS/Functions/PresetLoader.cs | 6 |
2 files changed, 24 insertions, 1 deletions
diff --git a/win/CS/Controls/PictureSettings.cs b/win/CS/Controls/PictureSettings.cs index 7684c9ad6..8e45b9778 100644 --- a/win/CS/Controls/PictureSettings.cs +++ b/win/CS/Controls/PictureSettings.cs @@ -26,6 +26,7 @@ namespace Handbrake.Controls private bool preventChangingDisplayWidth;
private double cachedDar;
private Title sourceTitle;
+ private Size presetMaximumResolution;
/// <summary>
/// Initializes a new instance of the <see cref="PictureSettings"/> class.
@@ -67,11 +68,27 @@ namespace Handbrake.Controls /// </summary>
public Preset CurrentlySelectedPreset { get; set; }
+ public bool SizeSet { get; set; }
+
/// <summary>
/// Gets or sets the maximum allowable size for the encoded resolution. Set a value to
/// "0" if the maximum does not matter.
/// </summary>
- public Size PresetMaximumResolution { get; set; }
+ public Size PresetMaximumResolution
+ {
+ get
+ {
+ return this.presetMaximumResolution;
+ }
+ set
+ {
+ this.presetMaximumResolution = value;
+ if (presetMaximumResolution == new Size(0, 0) && !SizeSet && this.sourceTitle != null)
+ {
+ text_width.Value = this.sourceTitle.Resolution.Width;
+ }
+ }
+ }
/// <summary>
/// Set the Preset Crop Warning Label
diff --git a/win/CS/Functions/PresetLoader.cs b/win/CS/Functions/PresetLoader.cs index 47029c935..6aacfd9c5 100644 --- a/win/CS/Functions/PresetLoader.cs +++ b/win/CS/Functions/PresetLoader.cs @@ -147,28 +147,34 @@ namespace Handbrake.Functions ? CheckState.Checked
: CheckState.Unchecked;
+ bool sizeSet = false;
// Set the Width and height as Required.
if (presetQuery.Width.HasValue)
{
mainWindow.PictureSettings.text_width.Value = presetQuery.Width.Value;
+ sizeSet = true;
}
if (presetQuery.Height.HasValue)
{
mainWindow.PictureSettings.text_height.Value = presetQuery.Height.Value;
+ sizeSet = true;
}
// Max Width/Height override Width/Height
if (presetQuery.MaxWidth.HasValue)
{
mainWindow.PictureSettings.text_width.Value = presetQuery.MaxWidth.Value;
+ sizeSet = true;
}
if (presetQuery.MaxHeight.HasValue)
{
mainWindow.PictureSettings.text_height.Value = presetQuery.MaxHeight.Value;
+ sizeSet = true;
}
+ mainWindow.PictureSettings.SizeSet = sizeSet;
mainWindow.PictureSettings.PresetMaximumResolution = new Size(
presetQuery.MaxWidth.HasValue ? presetQuery.MaxWidth.Value : 0,
presetQuery.MaxHeight.HasValue ? presetQuery.MaxHeight.Value : 0);
|