image resizer and settings percentage unit (#8674)

microsoft · Dec 21, 2020 · 11bdbaa · 11bdbaa
1 parent 34ff670
commit 11bdbaa
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 6 deletions.
diff --git a/src/modules/imageresizer/tests/Models/ResizeSizeTests.cs b/src/modules/imageresizer/tests/Models/ResizeSizeTests.cs
@@ -7,7 +7,6 @@
 using ImageResizer.Properties;
 using ImageResizer.Test;
 using Xunit;
-using Xunit.Extensions;
 
 namespace ImageResizer.Models
 {
@@ -269,5 +268,41 @@ public void ConvertToPixelsWorksWhenPixels()
 
             Assert.Equal(50, result);
         }
+
+        [Theory]
+        [InlineData(ResizeFit.Fill, ResizeUnit.Centimeter)]
+        [InlineData(ResizeFit.Fill, ResizeUnit.Inch)]
+        [InlineData(ResizeFit.Fill, ResizeUnit.Pixel)]
+        [InlineData(ResizeFit.Fit, ResizeUnit.Centimeter)]
+        [InlineData(ResizeFit.Fit, ResizeUnit.Inch)]
+        [InlineData(ResizeFit.Fit, ResizeUnit.Pixel)]
+        [InlineData(ResizeFit.Stretch, ResizeUnit.Centimeter)]
+        [InlineData(ResizeFit.Stretch, ResizeUnit.Inch)]
+        [InlineData(ResizeFit.Stretch, ResizeUnit.Percent)]
+        [InlineData(ResizeFit.Stretch, ResizeUnit.Pixel)]
+        public void HeightVisible(ResizeFit fit, ResizeUnit unit)
+        {
+            var size = new ResizeSize
+            {
+                Fit = fit,
+                Unit = unit,
+            };
+
+            Assert.True(size.ShowHeight);
+        }
+
+        [Theory]
+        [InlineData(ResizeFit.Fill, ResizeUnit.Percent)]
+        [InlineData(ResizeFit.Fit, ResizeUnit.Percent)]
+        public void HeightNotVisible(ResizeFit fit, ResizeUnit unit)
+        {
+            var size = new ResizeSize
+            {
+                Fit = fit,
+                Unit = unit,
+            };
+
+            Assert.False(size.ShowHeight);
+        }
     }
 }
diff --git a/src/modules/imageresizer/ui/Models/ResizeSize.cs b/src/modules/imageresizer/ui/Models/ResizeSize.cs
@@ -52,7 +52,15 @@ public virtual string Name
         public ResizeFit Fit
         {
             get => _fit;
-            set => Set(ref _fit, value);
+            set
+            {
+                var previousFit = _fit;
+                Set(ref _fit, value);
+                if (!Equals(previousFit, value))
+                {
+                    UpdateShowHeight();
+                }
+            }
         }
 
         [JsonProperty(PropertyName = "width")]
@@ -112,7 +120,7 @@ private static string ReplaceTokens(string text)
 
         private void UpdateShowHeight()
         {
-            ShowHeight = Unit != ResizeUnit.Percent;
+            ShowHeight = Fit == ResizeFit.Stretch || Unit != ResizeUnit.Percent;
         }
 
         private double ConvertToPixels(double value, ResizeUnit unit, int originalValue, double dpi)

diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/ImageSize.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/ImageSize.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -70,7 +70,7 @@ public int ExtraBoxOpacity
         {
             get
             {
-                if (Unit == 2)
+                if (Unit == 2 && Fit != 2)
                 {
                     return 0;
                 }
@@ -85,7 +85,7 @@ public bool EnableEtraBoxes
         {
             get
             {
-                if (Unit == 2)
+                if (Unit == 2 && Fit != 2)
                 {
                     return false;
                 }
@@ -128,6 +128,8 @@ public int Fit
                 {
                     _fit = value;
                     OnPropertyChanged();
+                    OnPropertyChanged(nameof(ExtraBoxOpacity));
+                    OnPropertyChanged(nameof(EnableEtraBoxes));
                 }
             }
         }