Skip to content

Commit 934774c

Browse files
committed
Attempt to fix rare MeasureOverride crash
1 parent b56615e commit 934774c

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -636,12 +636,11 @@
636636
</Grid>
637637
<Grid x:Name="WpfPackageParentGrid"
638638
Grid.Row="1"
639-
Width="48"
639+
Width="50"
640+
Height="50"
640641
DataContext="{x:Bind WpfContext}"
641642
Visibility="{Binding IsWpfPackageEnabled, Converter={StaticResource BooleanVisibilityConverter}}">
642643
<Button x:Name="WpfPackageBtn"
643-
MinWidth="48"
644-
MinHeight="48"
645644
Padding="0"
646645
HorizontalAlignment="Right"
647646
BorderThickness="0"
@@ -737,7 +736,7 @@
737736
</Button>
738737
</Grid>
739738
<Grid Grid.Row="2"
740-
MinWidth="240"
739+
MinWidth="260"
741740
Margin="0,0,0,8"
742741
Padding="8"
743742
HorizontalAlignment="Stretch"
@@ -894,9 +893,7 @@
894893
</Grid>
895894
</Flyout>
896895
</Button.Resources>
897-
<Grid MinWidth="48"
898-
MinHeight="48"
899-
Margin="-1"
896+
<Grid Margin="-1"
900897
HorizontalAlignment="Stretch"
901898
VerticalAlignment="Stretch"
902899
Background="{ThemeResource GameSettingsBtnBrush}"
@@ -912,18 +909,14 @@
912909
<Border Background="{ThemeResource SmokeFillColorCollapseBrush}" />
913910
<Border Background="{ThemeResource SmokeFillColorCollapseBrush}"
914911
Opacity=".5" />
915-
<ProgressRing Width="50"
916-
Height="50"
917-
MinWidth="48"
918-
MinHeight="48"
919-
Foreground="{ThemeResource AccentColorBrush}"
912+
<ProgressRing Foreground="{ThemeResource AccentColorBrush}"
920913
IsIndeterminate="{Binding Status.IsProgressAllIndetermined, Mode=OneWay}"
921914
Maximum="100"
922915
Minimum="0"
916+
Width="48"
917+
Height="48"
923918
Value="{Binding Progress.ProgressAllPercentage, Mode=OneWay}" />
924-
<TextBlock MinWidth="48"
925-
MinHeight="8"
926-
Margin="0,0,0,2"
919+
<TextBlock Margin="0,0,0,2"
927920
HorizontalAlignment="Center"
928921
VerticalAlignment="Center"
929922
extension:TextBlockExtension.PreserveSpace="False"

0 commit comments

Comments
 (0)