Fix decimal points and percentage sign % for height and width textb…

…oxes
Ruben2776 · Jan 27, 2025 · d88b273 · d88b273
1 parent 0a63ee1
commit d88b273
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/PicView.Avalonia/Resizing/AspectRatioHelper.cs b/src/PicView.Avalonia/Resizing/AspectRatioHelper.cs
@@ -14,8 +14,8 @@ public static void SetAspectRatioForTextBox(TextBox widthTextBox, TextBox height
         var percentage = isWidth ? widthTextBox.Text.GetPercentage() : heightTextBox.Text.GetPercentage();
         if (percentage > 0)
         {
-            var newWidth = vm.PixelWidth * (percentage / 100);
-            var newHeight = vm.PixelHeight * (percentage / 100);
+            var newWidth = Convert.ToUInt32(vm.PixelWidth * (percentage / 100));
+            var newHeight = Convert.ToUInt32(vm.PixelHeight * (percentage / 100));
 
             widthTextBox.Text = newWidth.ToString("# ", CultureInfo.CurrentCulture);
             heightTextBox.Text = newHeight.ToString("# ", CultureInfo.CurrentCulture);
@@ -58,12 +58,12 @@ public static void SetAspectRatioForTextBox(TextBox widthTextBox, TextBox height
 
             if (isWidth)
             {
-                var newHeight = Math.Round(width / aspectRatio);
+                var newHeight = Convert.ToUInt32(Math.Round(width / aspectRatio));
                 heightTextBox.Text = newHeight.ToString(CultureInfo.CurrentCulture);
             }
             else
             {
-                var newWidth = Math.Round(height * aspectRatio);
+                var newWidth = Convert.ToUInt32(Math.Round(height * aspectRatio));
                 widthTextBox.Text = newWidth.ToString(CultureInfo.CurrentCulture);
             }
         }

diff --git a/src/PicView.Avalonia/Views/ExifView.axaml.cs b/src/PicView.Avalonia/Views/ExifView.axaml.cs
@@ -125,6 +125,10 @@ private void AdjustAspectRatio(TextBox sender)
         {
             return;
         }
+        var aspectRatio = (double)vm.PixelWidth / vm.PixelHeight;
+        AspectRatioHelper.SetAspectRatioForTextBox(PixelWidthTextBox, PixelHeightTextBox, sender == PixelWidthTextBox,
+            aspectRatio, DataContext as MainViewModel);
+
         if (!int.TryParse(PixelWidthTextBox.Text, out var width) || !int.TryParse(PixelHeightTextBox.Text, out var height))
         {
             return;
@@ -140,11 +144,7 @@ private void AdjustAspectRatio(TextBox sender)
         SizeMpTextBox.Text = printSizes.SizeMp;
 
         var gcd = ImageTitleFormatter.GCD(width, height);
-        var aspectRatio = (double)vm.PixelWidth / vm.PixelHeight;
         AspectRatioTextBox.Text = AspectRatioHelper.GetFormattedAspectRatio(gcd, vm.PixelWidth, vm.PixelHeight);
-
-        AspectRatioHelper.SetAspectRatioForTextBox(PixelWidthTextBox, PixelHeightTextBox, sender == PixelWidthTextBox,
-            aspectRatio, DataContext as MainViewModel);
     }
 
     private static async Task DoResize(MainViewModel vm, bool isWidth, object width, object height)