Improve NaturalSize layout handling

cyanfish · Aug 1, 2024 · 401885d · 401885d
1 parent 1746100
commit 401885d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/NAPS2.Lib/EtoForms/Layout/LayoutControl.cs b/NAPS2.Lib/EtoForms/Layout/LayoutControl.cs
@@ -153,9 +153,9 @@ private SizeF UpdateFixedDimensions(LayoutContext context, SizeF size)
         {
             size.Width = Width.Value;
         }
-        if (context.IsNaturalSizeQuery && NaturalWidth != null)
+        if (!context.IsLayout && NaturalWidth != null)
         {
-            size.Width = Math.Max(size.Width, NaturalWidth.Value);
+            size.Width = NaturalWidth.Value;
         }
         if (Height != null)
         {
@@ -169,9 +169,9 @@ private SizeF UpdateFixedDimensions(LayoutContext context, SizeF size)
         {
             size.Height = Math.Max(size.Height, MinHeight.Value);
         }
-        if (context.IsNaturalSizeQuery && NaturalHeight != null)
+        if (!context.IsLayout && NaturalHeight != null)
         {
-            size.Height = Math.Max(size.Height, NaturalHeight.Value);
+            size.Height = NaturalHeight.Value;
         }
         return size;
     }