From 4bde46e2b8644d9e4c26a4e0b215443612d1afcc Mon Sep 17 00:00:00 2001
From: Xu <34770031+Blinue@users.noreply.github.com>
Date: Sun, 7 Apr 2024 21:02:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20SimpleStackPanel=20?=
 =?UTF-8?q?=E7=9A=84=E5=AD=90=E9=A1=B9=E7=BB=91=E5=AE=9A=E6=9C=89=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E8=B5=B7=E4=BD=9C=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20(#885)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Magpie.App/ScalingConfigurationPage.xaml | 2 +-
 src/Magpie.App/SimpleStackPanel.cpp          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Magpie.App/ScalingConfigurationPage.xaml b/src/Magpie.App/ScalingConfigurationPage.xaml
index f909d76a0..02619f83e 100644
--- a/src/Magpie.App/ScalingConfigurationPage.xaml
+++ b/src/Magpie.App/ScalingConfigurationPage.xaml
@@ -288,7 +288,7 @@
 										</ListView.ItemContainerTransitions>
 										<ListView.ItemsPanel>
 											<ItemsPanelTemplate>
-												<!--  SimpleStackPanel 不支持拖拽  -->
+												<!--  SimpleStackPanel 不支持拖放  -->
 												<StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
 												            Orientation="Vertical" />
 											</ItemsPanelTemplate>
diff --git a/src/Magpie.App/SimpleStackPanel.cpp b/src/Magpie.App/SimpleStackPanel.cpp
index 44281175b..81e023962 100644
--- a/src/Magpie.App/SimpleStackPanel.cpp
+++ b/src/Magpie.App/SimpleStackPanel.cpp
@@ -46,12 +46,14 @@ Size SimpleStackPanel::MeasureOverride(const Size& availableSize) const {
 	Size finalSize{ paddings.Width, paddings.Height };
 
 	for (UIElement const& item : Children()) {
+		// 调用 Measure 可以初始化绑定，因此即使子项不可见也要调用
+		item.Measure(childAvailableSize);
+
 		if (item.Visibility() == Visibility::Collapsed) {
 			// 不可见的子项不添加间距
 			continue;
 		}
 
-		item.Measure(childAvailableSize);
 		const Size itemSize = item.DesiredSize();
 
 		if (isVertical) {