chore: Progress

unoplatform · Oct 14, 2024 · 8e63451 · 8e63451
1 parent b623c74
commit 8e63451
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 63 deletions.
diff --git a/...amplesApp/UITests.Shared/Windows_UI_Xaml/DragAndDrop/DragDrop_ListView_Custom_States.xaml b/...amplesApp/UITests.Shared/Windows_UI_Xaml/DragAndDrop/DragDrop_ListView_Custom_States.xaml
@@ -179,15 +179,13 @@
 								<Grid.RenderTransform>
 									<TranslateTransform x:Name="ContentPresenterTranslateTransform" />
 								</Grid.RenderTransform>
-								<!-- Uno workaround: template-bind ContentTemplateSelector because it's not automatically propagated from the ContentControl -->
 								<toolkit:ElevatedView x:Name="ElevatedView"
 													  Background="Beige"
 													  ShadowColor="DimGray"
 													  Margin="3">
 									<ContentPresenter x:Name="ContentPresenter"
 													  ContentTransitions="{TemplateBinding ContentTransitions}"
 													  ContentTemplate="{TemplateBinding ContentTemplate}"
-													  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
 													  Content="{TemplateBinding Content}"
 													  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
 													  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"

diff --git a/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/Button_themeresources.xaml b/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/Button_themeresources.xaml
@@ -138,7 +138,6 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
-                    <!-- Uno workaround: template-bind ContentTemplateSelector because it's not automatically propagated from the ContentControl -->
                     <ContentPresenter
                         x:Name="ContentPresenter"
                         Background="{TemplateBinding Background}"
@@ -147,7 +146,6 @@
                         BorderThickness="{TemplateBinding BorderThickness}"
                         Content="{TemplateBinding Content}"
                         ContentTemplate="{TemplateBinding ContentTemplate}"
-                        ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
                         ContentTransitions="{TemplateBinding ContentTransitions}"
                         CornerRadius="{TemplateBinding CornerRadius}"
                         Padding="{TemplateBinding Padding}"
@@ -289,5 +287,5 @@
             </Setter.Value>
         </Setter>
     </Style>
-    
+
 </ResourceDictionary>
diff --git a/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/CheckBox_themeresources.xaml b/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/CheckBox_themeresources.xaml
@@ -276,7 +276,7 @@
     </ResourceDictionary.ThemeDictionaries>
 
     <Style TargetType="CheckBox" BasedOn="{StaticResource DefaultCheckBoxStyle}" />
-    
+
     <Style x:Key="DefaultCheckBoxStyle" TargetType="CheckBox">
         <Setter Property="Background" Value="{ThemeResource CheckBoxBackgroundUnchecked}" />
         <Setter Property="Foreground" Value="{ThemeResource CheckBoxForegroundUnchecked}" />
@@ -656,10 +656,8 @@
                                 Opacity="0" />
 
                         </Grid>
-						<!-- Uno workaround: template-bind ContentTemplateSelector because it's not automatically propagated from the ContentControl -->
                         <ContentPresenter x:Name="ContentPresenter"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
-                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
                             ContentTransitions="{TemplateBinding ContentTransitions}"
                             Content="{TemplateBinding Content}"
                             Margin="{TemplateBinding Padding}"

diff --git a/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/DropDownButton.xaml b/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/DropDownButton.xaml
@@ -94,12 +94,10 @@
                                 <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
 
-                        	<!-- Uno workaround: template-bind ContentTemplateSelector because it's not automatically propagated from the ContentControl -->
                             <ContentPresenter x:Name="ContentPresenter"
                                 Content="{TemplateBinding Content}"
                                 ContentTransitions="{TemplateBinding ContentTransitions}"
                                 ContentTemplate="{TemplateBinding ContentTemplate}"
-                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                                 AutomationProperties.AccessibilityView="Raw" />

diff --git a/...Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/ListViewItem_themeresources.xaml b/...Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/ListViewItem_themeresources.xaml
@@ -638,11 +638,9 @@
                             <Grid.RenderTransform>
                                 <TranslateTransform x:Name="ContentPresenterTranslateTransform" />
                             </Grid.RenderTransform>
-                            <!-- Uno workaround: template-bind ContentTemplateSelector because it's not automatically propagated from the ContentControl -->
                             <ContentPresenter x:Name="ContentPresenter"
                                 ContentTransitions="{TemplateBinding ContentTransitions}"
                                 ContentTemplate="{TemplateBinding ContentTemplate}"
-                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
                                 Content="{TemplateBinding Content}"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -714,7 +712,7 @@
             </Setter.Value>
         </Setter>
     </Style>
- 
+
     <Style x:Key="ListPickerFlyoutPresenterItemStyle" TargetType="ListViewItem">
         <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
         <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />

diff --git a/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/RadioButton_themeresources.xaml b/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/RadioButton_themeresources.xaml
@@ -307,10 +307,7 @@
                             <Ellipse x:Name="CheckOuterEllipse" Width="20" Height="20" UseLayoutRounding="False" Stroke="{ThemeResource RadioButtonOuterEllipseCheckedStroke}" Fill="{ThemeResource RadioButtonOuterEllipseCheckedFill}" Opacity="0" StrokeThickness="{ThemeResource RadioButtonBorderThemeThickness}" />
                             <Ellipse x:Name="CheckGlyph" Width="8" Height="8" UseLayoutRounding="False" Opacity="0" Fill="{ThemeResource RadioButtonCheckGlyphFill}" Stroke="{ThemeResource RadioButtonCheckGlyphStroke}" />
                         </Grid>
-                        <!-- Uno workaround: template-bind ContentTemplateSelector because it's not automatically propagated from the ContentControl -->
-                        <ContentPresenter x:Name="ContentPresenter" Content="{TemplateBinding Content}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Foreground="{TemplateBinding Foreground}" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Column="1" AutomationProperties.AccessibilityView="Raw" TextWrapping="Wrap" 
-                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                        />
+                        <ContentPresenter x:Name="ContentPresenter" Content="{TemplateBinding Content}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Foreground="{TemplateBinding Foreground}" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Column="1" AutomationProperties.AccessibilityView="Raw" TextWrapping="Wrap" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>

diff --git a/...Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/RepeatButton_themeresources.xaml b/...Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/RepeatButton_themeresources.xaml
@@ -98,15 +98,13 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="RepeatButton">
-					<!-- Uno workaround: template-bind ContentTemplateSelector because it's not automatically propagated from the ContentControl -->
                     <ContentPresenter x:Name="ContentPresenter"
                                       Background="{TemplateBinding Background}"
                                       BackgroundSizing="{TemplateBinding BackgroundSizing}"
                                       BorderBrush="{TemplateBinding BorderBrush}"
                                       BorderThickness="{TemplateBinding BorderThickness}"
                                       Content="{TemplateBinding Content}"
                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                      ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
                                       ContentTransitions="{TemplateBinding ContentTransitions}"
                                       CornerRadius="{TemplateBinding CornerRadius}"
                                       Padding="{TemplateBinding Padding}"

diff --git a/...Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/ToggleButton_themeresources.xaml b/...Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/ToggleButton_themeresources.xaml
@@ -198,16 +198,14 @@
         <Setter Property="Template">
             <Setter.Value>
 				<ControlTemplate TargetType="ToggleButton">
-					<!-- Uno workaround: template-bind ContentTemplateSelector because it's not automatically propagated from the ContentControl -->
-					<ContentPresenter 
+					<ContentPresenter
                         x:Name="ContentPresenter"
                         Background="{TemplateBinding Background}"
                         contract7Present:BackgroundSizing="{TemplateBinding BackgroundSizing}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         Content="{TemplateBinding Content}"
                         ContentTemplate="{TemplateBinding ContentTemplate}"
-                        ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
 						ContentTransitions="{TemplateBinding ContentTransitions}"
                         contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
                         contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"