Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Aug 15, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4402407
fix: Fix AlternateContent for ToogleButton crashing on UWP when not set
lesterbotello Aug 7, 2023
d8553c7
fix: Adjusts opacity instead of visibility
lesterbotello Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/library/Uno.Material/Styles/Application/Common/Converters.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
NotNullValue="Visible"
NullValue="Collapsed" />

<um:FromNullToValueConverter x:Key="MaterialNullToTransparent"
NotNullValue="1"
NullValue="0" />

<um:FromEmptyStringOrNullObjectToValueConverter x:Key="MaterialEmptyOrNullToVisible"
NotEmptyOrNullValue="Collapsed"
EmptyOrNullValue="Visible" />
Expand Down
37 changes: 18 additions & 19 deletions src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,9 +457,6 @@
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="VerticalContentAlignment" Value="Center" />

<!-- Workaround for WinUI issue: https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
<Setter Property="um:ControlExtensions.AlternateContent" Value="{x:Null}" />

<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ToggleButton">
Expand All @@ -473,9 +470,9 @@
<VisualState x:Name="Normal" />
<VisualState x:Name="PointerOver">
<VisualState.Setters>
<Setter Target="ContentPresenter.Visibility" Value="Visible" />
<Setter Target="ContentPresenter.Opacity" Value="1" />
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource IconToggleButtonForegroundPointerOver}" />
<Setter Target="AlternateContentPresenter.Visibility" Value="Collapsed" />
<Setter Target="AlternateContentPresenter.Opacity" Value="0" />
<Setter Target="AlternateContentPresenter.Foreground" Value="{ThemeResource IconToggleButtonForegroundPointerOver}" />
<Setter Target="HoverOverlay.Opacity" Value="1" />
<Setter Target="RootGrid.Background" Value="{ThemeResource IconToggleButtonBackgroundPointerOver}" />
Expand All @@ -484,9 +481,9 @@
</VisualState>
<VisualState x:Name="Pressed">
<VisualState.Setters>
<Setter Target="ContentPresenter.Visibility" Value="Visible" />
<Setter Target="ContentPresenter.Opacity" Value="1" />
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource IconToggleButtonForegroundPressed}" />
<Setter Target="AlternateContentPresenter.Visibility" Value="Collapsed" />
<Setter Target="AlternateContentPresenter.Opacity" Value="0" />
<Setter Target="AlternateContentPresenter.Foreground" Value="{ThemeResource IconToggleButtonForegroundPressed}" />
<Setter Target="PressedOverlay.Opacity" Value="1" />
<Setter Target="RootGrid.Background" Value="{ThemeResource IconToggleButtonBackgroundPressed}" />
Expand All @@ -495,29 +492,31 @@
</VisualState>
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="ContentPresenter.Visibility" Value="Visible" />
<Setter Target="ContentPresenter.Opacity" Value="1" />
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource IconToggleButtonForegroundDisabled}" />
<Setter Target="AlternateContentPresenter.Visibility" Value="Collapsed" />
<Setter Target="AlternateContentPresenter.Opacity" Value="0" />
<Setter Target="AlternateContentPresenter.Foreground" Value="{ThemeResource IconToggleButtonForegroundDisabled}" />
<Setter Target="RootGrid.Background" Value="{ThemeResource IconToggleButtonBackgroundDisabled}" />
<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource IconToggleButtonBorderBrushDisabled}" />
</VisualState.Setters>
</VisualState>
<!-- For the checked states, we need to also validate if AlternateContent is set first before changing opacity -->
<!-- https://github.com/unoplatform/Uno.Themes/issues/1132 -->
agneszitte marked this conversation as resolved.
Show resolved Hide resolved
<VisualState x:Name="Checked">
<VisualState.Setters>
<Setter Target="ContentPresenter.Visibility" Value="Collapsed" />
<Setter Target="ContentPresenter.Opacity" Value="0" />
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource IconToggleButtonForegroundChecked}" />
<Setter Target="AlternateContentPresenter.Visibility" Value="Visible" />
<Setter Target="AlternateContentPresenter.Opacity" Value="{Binding Path=(um:ControlExtensions.AlternateContent), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToTransparent}, FallbackValue=1, TargetNullValue=1}" />
<Setter Target="AlternateContentPresenter.Foreground" Value="{ThemeResource IconToggleButtonForegroundChecked}" />
<Setter Target="RootGrid.Background" Value="{ThemeResource IconToggleButtonBackgroundChecked}" />
<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource IconToggleButtonBorderBrushChecked}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="CheckedPointerOver">
<VisualState.Setters>
<Setter Target="ContentPresenter.Visibility" Value="Collapsed" />
<Setter Target="ContentPresenter.Opacity" Value="0" />
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource IconToggleButtonForegroundCheckedPointerOver}" />
<Setter Target="AlternateContentPresenter.Visibility" Value="Visible" />
<Setter Target="AlternateContentPresenter.Opacity" Value="{Binding Path=(um:ControlExtensions.AlternateContent), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToTransparent}, FallbackValue=1, TargetNullValue=1}" />
<Setter Target="AlternateContentPresenter.Foreground" Value="{ThemeResource IconToggleButtonForegroundCheckedPointerOver}" />
<Setter Target="HoverOverlay.Opacity" Value="1" />
<Setter Target="RootGrid.Background" Value="{ThemeResource IconToggleButtonBackgroundCheckedPointerOver}" />
Expand All @@ -526,9 +525,9 @@
</VisualState>
<VisualState x:Name="CheckedPressed">
<VisualState.Setters>
<Setter Target="ContentPresenter.Visibility" Value="Collapsed" />
<Setter Target="ContentPresenter.Opacity" Value="0" />
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource IconToggleButtonForegroundCheckedPressed}" />
<Setter Target="AlternateContentPresenter.Visibility" Value="Visible" />
<Setter Target="AlternateContentPresenter.Opacity" Value="{Binding Path=(um:ControlExtensions.AlternateContent), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToTransparent}, FallbackValue=1, TargetNullValue=1}" />
<Setter Target="AlternateContentPresenter.Foreground" Value="{ThemeResource IconToggleButtonForegroundCheckedPressed}" />
<Setter Target="PressedOverlay.Opacity" Value="1" />
<Setter Target="RootGrid.Background" Value="{ThemeResource IconToggleButtonBackgroundCheckedPressed}" />
Expand All @@ -537,9 +536,9 @@
</VisualState>
<VisualState x:Name="CheckedDisabled">
<VisualState.Setters>
<Setter Target="ContentPresenter.Visibility" Value="Collapsed" />
<Setter Target="ContentPresenter.Opacity" Value="0" />
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource IconToggleButtonForegroundCheckedDisabled}" />
<Setter Target="AlternateContentPresenter.Visibility" Value="Visible" />
<Setter Target="AlternateContentPresenter.Opacity" Value="{Binding Path=(um:ControlExtensions.AlternateContent), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToTransparent}, FallbackValue=1, TargetNullValue=1}" />
<Setter Target="AlternateContentPresenter.Foreground" Value="{ThemeResource IconToggleButtonForegroundCheckedDisabled}" />
<Setter Target="RootGrid.Background" Value="{ThemeResource IconToggleButtonBackgroundCheckedDisabled}" />
<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource IconToggleButtonBorderBrushCheckedDisabled}" />
Expand Down Expand Up @@ -605,11 +604,11 @@
<!-- 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=' '}"
lesterbotello marked this conversation as resolved.
Show resolved Hide resolved
Foreground="{TemplateBinding Foreground}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Visibility="Collapsed" />
Opacity="0"/>
</Grid>
</ControlTemplate>
</Setter.Value>
Expand Down
16 changes: 15 additions & 1 deletion ...samples/UWP/Uno.Themes.Samples.Shared/Content/Extensions/ControlExtensionsSamplePage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Loading