From 165365473ffdf4a812820e898f72583060f13473 Mon Sep 17 00:00:00 2001 From: Lavius Motileng <58791731+laviusmotileng-ms@users.noreply.github.com> Date: Fri, 19 Jun 2020 13:18:37 -0700 Subject: [PATCH] [Settings][Fix][Image Resizer ] Unused text box when selecting custom percent in new settings (#4344) * save general settings to file upon launch * ImageResizer: Added flags to disable and hide extra boxes Co-authored-by: Lavius Motileng --- .../ImageSize.cs | 32 +++++++++++++++++++ .../Views/ImageResizerPage.xaml | 3 ++ src/runner/main.cpp | 1 - src/runner/settings_window.cpp | 4 +++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageSize.cs b/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageSize.cs index 491973b138..f2646afe40 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageSize.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageSize.cs @@ -68,6 +68,36 @@ namespace Microsoft.PowerToys.Settings.UI.Lib } } + public int ExtraBoxOpacity + { + get + { + if (Unit == 2) + { + return 0; + } + else + { + return 100; + } + } + } + + public bool EnableEtraBoxes + { + get + { + if (Unit == 2) + { + return false; + } + else + { + return true; + } + } + } + [JsonPropertyName("name")] public string Name { @@ -154,6 +184,8 @@ namespace Microsoft.PowerToys.Settings.UI.Lib { _unit = value; OnPropertyChanged(); + OnPropertyChanged("ExtraBoxOpacity"); + OnPropertyChanged("EnableEtraBoxes"); } } } diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml index c2243a943c..3f5a42b262 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml +++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml @@ -128,6 +128,7 @@ TextAlignment="Center" VerticalAlignment="Center" Margin="{StaticResource SmallTopMargin}" + Opacity="{x:Bind Path=ExtraBoxOpacity, Mode=OneWay}" Width="25"/>