cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-10-26 09:01:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve NaturalSize layout handling

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2024-08-01 13:13:50 -07:00
parent 1746100be1
commit 401885dcc7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NAPS2.Lib/EtoForms/Layout/LayoutControl.cs
View File

@ -153,9 +153,9 @@ public class LayoutControl : LayoutElement
{
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 @@ public class LayoutControl : LayoutElement
{
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;
}