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: Align ContentPresenter/ContentControl with WinUI on Skia and Wasm #18455

Draft
wants to merge 22 commits into
base: master
Choose a base branch
from
Draft

fix: Align ContentPresenter/ContentControl with WinUI on Skia and Wasm #18455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
7b48e10
fix: Align ContentPresenter/ContentControl with WinUI on Skia and Wasm
Youssef1313 Oct 12, 2024
1af7ed2
chore: remove dead code
Youssef1313 Oct 12, 2024
ded1890
chore: Adjust
Youssef1313 Oct 12, 2024
6814c16
chore: Small fix
Youssef1313 Oct 12, 2024
fa4dd30
chore: Cleanup
Youssef1313 Oct 12, 2024
8f21677
chore: Small fix
Youssef1313 Oct 12, 2024
7d1024d
chore: Progress
Youssef1313 Oct 13, 2024
688e195
chore: Docs
Youssef1313 Oct 13, 2024
0b6475e
chore: Fix build errors
Youssef1313 Oct 13, 2024
3ae7067
chore: Fix build
Youssef1313 Oct 13, 2024
c926cf2
chore: Cleanup
Youssef1313 Oct 13, 2024
d3cb9d3
chore: Be future proof
Youssef1313 Oct 13, 2024
07f6598
chore: Fix build
Youssef1313 Oct 13, 2024
392eddd
chore: Uno-specific bit, for unknown reason. And adjust tests
Youssef1313 Oct 13, 2024
69ff6b3
chore: Fix build
Youssef1313 Oct 13, 2024
6b2796d
chore: Adjust
Youssef1313 Oct 14, 2024
b623c74
chore: Fix mobile build
Youssef1313 Oct 14, 2024
8e63451
chore: Progress
Youssef1313 Oct 14, 2024
39229e7
chore: Progress
Youssef1313 Oct 14, 2024
da5c37b
chore: Adjust
Youssef1313 Oct 14, 2024
8380e8c
chore: Progress
Youssef1313 Oct 14, 2024
73c0da3
chore: Adjust tests for Uno
Youssef1313 Oct 14, 2024
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
1 change: 0 additions & 1 deletion ...sApp/SamplesApp.UnitTests.Shared/Controls/UITests/Views/Styles/Controls/ListViewItem.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
<ContentPresenter x:Name="ContentPresenter"
not_win:Content="{TemplateBinding Content}"
not_win:ContentTemplate="{TemplateBinding ContentTemplate}"
not_win:ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
ContentTransitions="{TemplateBinding ContentTransitions}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Expand Down
8 changes: 5 additions & 3 deletions src/SamplesApp/SamplesApp.Windows/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"profiles": {
"SamplesApp.Windows (Package)": {
"commandName": "MsixPackage"
"commandName": "MsixPackage",
"nativeDebugging": true
},
"SamplesApp.Windows (Unpackaged)": {
"commandName": "Project"
"commandName": "Project",
"nativeDebugging": true
}
}
}
}
2 changes: 0 additions & 2 deletions ...amplesApp/UITests.Shared/Windows_UI_Xaml/DragAndDrop/DragDrop_ListView_Custom_States.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
1 change: 0 additions & 1 deletion src/SamplesApp/UITests.Shared/Windows_UI_Xaml/DragAndDrop/DragDrop_ListView_Selection.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
Content="{TemplateBinding Content}"
ContentTransitions="{TemplateBinding ContentTransitions}"
ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Margin="4,0,0,0" />
Expand Down
4 changes: 1 addition & 3 deletions src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/Button_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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}"
Expand Down Expand Up @@ -289,5 +287,5 @@
</Setter.Value>
</Setter>
</Style>

</ResourceDictionary>
4 changes: 1 addition & 3 deletions src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/CheckBox_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}" />
Expand Down Expand Up @@ -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}"
Expand Down
2 changes: 0 additions & 2 deletions src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/DropDownButton.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 1 addition & 3 deletions ...Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/ListViewItem_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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}" />
Expand Down
5 changes: 1 addition & 4 deletions src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/RadioButton_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions ...Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/RepeatButton_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
4 changes: 1 addition & 3 deletions ...Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/ToggleButton_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
Loading
Loading