fix: Fix AlternateContent for ToogleButton crashing on UWP when not set

unoplatform · Aug 7, 2023 · 4402407 · 4402407
1 parent 8b41c7d
commit 4402407
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml b/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml
@@ -605,7 +605,7 @@
 						<!-- Alternate Content -->
 						<ContentPresenter x:Name="AlternateContentPresenter"
 										  AutomationProperties.AccessibilityView="Raw"
-										  Content="{Binding Path=(um:ControlExtensions.AlternateContent), RelativeSource={RelativeSource TemplatedParent}}"
+										  Content="{Binding Path=(um:ControlExtensions.AlternateContent), RelativeSource={RelativeSource TemplatedParent}, FallbackValue=' ', TargetNullValue=' '}"
 										  Foreground="{TemplateBinding Foreground}"
 										  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
 										  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"

diff --git a/...samples/UWP/Uno.Themes.Samples.Shared/Content/Extensions/ControlExtensionsSamplePage.xaml b/...samples/UWP/Uno.Themes.Samples.Shared/Content/Extensions/ControlExtensionsSamplePage.xaml
@@ -127,7 +127,7 @@
 
 				<smtx:XamlDisplay UniqueKey="ControlExtensionsSamplePage_ToggleButtonIcon"
 								  Style="{StaticResource XamlDisplayBelowStyle}">
-					<ToggleButton Style="{StaticResource MaterialToggleButtonIconStyle}">
+					<ToggleButton Style="{StaticResource MaterialIconToggleButtonStyle}">
 						<ToggleButton.Content>
 							<PathIcon Data="{StaticResource Icon_more_horizontal}" />
 						</ToggleButton.Content>
@@ -137,6 +137,20 @@
 					</ToggleButton>
 				</smtx:XamlDisplay>
 
+				<smtx:XamlDisplay UniqueKey="ControlExtensionsSamplePage_ToggleButtonIconWithSymbolIcon_NoAlternateContent"
+								  Style="{StaticResource XamlDisplayBelowStyle}">
+					<ToggleButton Style="{StaticResource MaterialIconToggleButtonStyle}">
+						<ToggleButton.Content>
+							<SymbolIcon Symbol="Accept" />
+						</ToggleButton.Content>
+					</ToggleButton>
+				</smtx:XamlDisplay>
+
+				<smtx:XamlDisplay UniqueKey="ControlExtensionsSamplePage_ToggleButtonIconWithPathIconOnly_NoAlternateContent"
+								  Style="{StaticResource XamlDisplayBelowStyle}">
+					<ToggleButton Style="{StaticResource MaterialIconToggleButtonStyle}"
+								  Content="Hello" />
+				</smtx:XamlDisplay>
 			</StackPanel>
 		</StackPanel>
 	</ScrollViewer>