From c1b3412ba17acfab91fb1c4fc3fa768e100623d4 Mon Sep 17 00:00:00 2001 From: Lightczx <1686188646@qq.com> Date: Tue, 11 Jun 2024 16:56:33 +0800 Subject: [PATCH] fix QA ComboBox width issue --- .../Snap.Hutao/Control/SizeRestrictedContentControl.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Control/SizeRestrictedContentControl.cs b/src/Snap.Hutao/Snap.Hutao/Control/SizeRestrictedContentControl.cs index 587070b6..a4f26248 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/SizeRestrictedContentControl.cs +++ b/src/Snap.Hutao/Snap.Hutao/Control/SizeRestrictedContentControl.cs @@ -21,8 +21,8 @@ internal sealed partial class SizeRestrictedContentControl : ContentControl element.Measure(availableSize); Size contentDesiredSize = element.DesiredSize; Size contentActualOrDesiredSize = new( - Math.Max(element.ActualWidth, contentDesiredSize.Width), - Math.Max(element.ActualHeight, contentDesiredSize.Height)); + Math.Min(Math.Max(element.ActualWidth, contentDesiredSize.Width), availableSize.Width), + Math.Min(Math.Max(element.ActualHeight, contentDesiredSize.Height), availableSize.Height)); if (IsWidthRestricted) {