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

Scale layout padding by dpi

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2024-08-28 20:34:13 -07:00
parent 5a0ff03170
commit bbcb44b327
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,8 +73,10 @@ public class LayoutControl : LayoutElement
bounds.Size = UpdateFixedDimensions(context, bounds.Size);
if (Control != null)
{
var location = new PointF(bounds.X + Padding.Left, bounds.Y + Padding.Top);
var size = new SizeF(bounds.Width - Padding.Horizontal, bounds.Height - Padding.Vertical);
var location = new PointF(bounds.X + Padding.Left * context.Scale, bounds.Y + Padding.Top * context.Scale);
var size = new SizeF(
bounds.Width - Padding.Horizontal * context.Scale,
bounds.Height - Padding.Vertical * context.Scale);
size = SizeF.Max(SizeF.Empty, size);
EnsureIsAdded(context);
EtoPlatform.Current.SetFrame(
@ -107,7 +109,9 @@ public class LayoutControl : LayoutElement
}
}
size = UpdateFixedDimensions(context, size);
return new SizeF(size.Width + Padding.Horizontal, size.Height + Padding.Vertical);
return new SizeF(
size.Width + Padding.Horizontal * context.Scale,
size.Height + Padding.Vertical * context.Scale);
}
private SizeF GetWrappedSize(LayoutContext context, RectangleF parentBounds, int wrapDefaultWidth)
@ -130,7 +134,8 @@ public class LayoutControl : LayoutElement
// usually what we want.
return new SizeF(
EtoPlatform.Current.GetWrappedSize(Control, (int) parentBounds.Width).Width,
EtoPlatform.Current.GetWrappedSize(Control, Math.Min((int) parentBounds.Width, wrapDefaultWidth)).Height);
EtoPlatform.Current.GetWrappedSize(Control, Math.Min((int) parentBounds.Width, wrapDefaultWidth))
.Height);
}
// Now that we've handled the special cases, this measures the real dimensions of the label given
// the parent bounds. In a layout cell, this ensures we align correctly (e.g. centered vertically).