Skip to content

Update all relevant WinUI 2.5 revs to 2.6 #4092

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

Merged
merged 7 commits into from
Jul 23, 2021
Merged

Update all relevant WinUI 2.5 revs to 2.6 #4092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0e68b0f
Update all revelvent winui 2.5.0 revs to 2.6.1
Rosuavio Jul 20, 2021
d451b1f
Workaround: NavigationView issues under winui2.6
Rosuavio Jul 7, 2021
b1ce979
Fix TileControl sample
Rosuavio Jul 13, 2021
8aed05f
Make Balde item better handle WinUI button style
Rosuavio Jul 15, 2021
9abaac7
Fix TolkenizingTextBoxItem close button.
Rosuavio Jul 15, 2021
4ef6951
BaldeView use WinUI themes.
Rosuavio Jul 16, 2021
9ceabc1
Expander - align style more with WinUI expander
Rosuavio Jul 16, 2021
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
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
</PackageReference>
-->
<PackageReference Include="Microsoft.UI.Xaml">
<Version>2.5.0</Version>
<Version>2.6.1</Version>
</PackageReference>
<PackageReference Include="Monaco.Editor">
<Version>0.7.0-alpha</Version>
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TileControl/TileControl.bind
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
ImageSource="ms-appx:///SamplePages/TileControl/Animations.png"
ParallaxSpeedRatio="@[Parallax Speed Ratio:DoubleSlider:1.2:1-3]"
ScrollViewerContainer="{Binding ElementName=FlipView, Mode=OneTime}">
<FlipView x:Name="FlipView">
<FlipView x:Name="FlipView" Background="Transparent">

<Border Style="{StaticResource BorderStyle}">
<TextBlock Style="{StaticResource TextBlockStyle}" Text="Parallax with FlipView &gt;"/>
Expand Down
3 changes: 3 additions & 0 deletions Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
MenuItemTemplate="{StaticResource CategoryTemplate}"
PaneDisplayMode="Top"
SelectionFollowsFocus="Disabled">
<winui:NavigationView.Resources>
<CornerRadius x:Key="NavigationViewContentGridCornerRadius">0,0,0,0</CornerRadius>
</winui:NavigationView.Resources>
<winui:NavigationView.AutoSuggestBox>
<AutoSuggestBox x:Name="SearchBox"
MinWidth="150"
Expand Down
1 change: 1 addition & 0 deletions Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<Setter Property="Visibility" Value="Visible" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Padding" Value="8,5,8,6" />
</Style>
Comment on lines 16 to 18
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@michael-hawker, this isolates from the WinUI change, not sure if it isolates too much and if we should do something to try to reflex the changed is style from WinUI?


<Style x:Key="TokenizingTextBoxItemTokenStyle" TargetType="controls:TokenizingTextBoxItem">
Expand Down
10 changes: 4 additions & 6 deletions Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
<Setter Property="TitleBarBackground" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" />
<Setter Property="Background" Value="{ThemeResource SystemControlBackgroundAltHighBrush}" />
<Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
Comment on lines 91 to 93
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to look a lot better, on dark and light system themes.
Found it here
https://github.com/microsoft/microsoft-ui-xaml/blob/5e815a2c4bfe2bc019562b01fffbeeb25866acf6/dev/CommonStyles/Common_themeresources_any.xaml#L185

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good in Dark theme, Light theme ... a little less so. No telling if/when WinUI will move the goal posts on Light theme.

<Setter Property="TabNavigation" Value="Local" />
<Setter Property="IsHoldingEnabled" Value="True" />
Expand All @@ -99,7 +99,7 @@
<Setter Property="Margin" Value="0" />
<Setter Property="MinWidth" Value="{ThemeResource GridViewItemMinWidth}" />
<Setter Property="MinHeight" Value="{ThemeResource GridViewItemMinHeight}" />
<Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundChromeHighBrush}" />
<Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
<Setter Property="BorderThickness" Value="1" />
Comment on lines 101 to 103
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seemed to go well with it.

<Setter Property="IsTabStop" Value="False" />
<Setter Property="IsExpanded" Value="True"/>
Expand Down Expand Up @@ -156,8 +156,7 @@
Background="{TemplateBinding CloseButtonBackground}"
Style="{StaticResource ButtonRevealStyle}"
BorderThickness="1"
Width="32"
Height="32"
VerticalAlignment="Stretch"
Content="&#xE73F;"
FontFamily="Segoe MDL2 Assets"
Comment on lines 158 to 161
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@michael-hawker @XAML-Knight, let me know what you think about solving the problem like this. I figured if the button changes underneath us again this would handle it best. Another option was to just make the width bigger based on the increased padding.

FontSize="14"
Expand All @@ -169,8 +168,7 @@
Background="{TemplateBinding CloseButtonBackground}"
Style="{StaticResource ButtonRevealStyle}"
BorderThickness="1"
Width="32"
Height="32"
VerticalAlignment="Stretch"
Content="&#xE711;"
FontFamily="Segoe MDL2 Assets"
FontSize="14"
Expand Down
5 changes: 2 additions & 3 deletions Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@

<Style x:Key="HeaderToggleButtonStyle"
TargetType="ToggleButton">
<Setter Property="Background" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" />
<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
<Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundTransparentBrush}" />
<Setter Property="Background" Value="{ThemeResource ExpanderHeaderBackground}" />
<Setter Property="BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Padding" Value="2,0,0,0" />
<Setter Property="Height" Value="40" />
Expand Down
2 changes: 1 addition & 1 deletion SmokeTests/SmokeTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<!-- Only the Layout package have a dependency on WinUI -->
<ItemGroup Condition="$(CurrentProject) == 'UWPBaselineWinUI' or $(CurrentProject) == 'Microsoft.Toolkit.Uwp.UI.Controls.Layout'">
<PackageReference Include="Microsoft.UI.Xaml">
<Version>2.5.0</Version>
<Version>2.6.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(CurrentProject)' != '' and '$(CurrentProject)' != 'UWPBaseline' and '$(CurrentProject)' != 'UWPBaselineWinUI' and '$(NuGetPackageVersion)' != 'To Fill In With Local Version Number'">
Expand Down
2 changes: 1 addition & 1 deletion UITests/UITests.Tests.TAEF/UITests.App.dependencies.Debug.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Microsoft.NET.CoreFramework.Debug.2.2.appx
Microsoft.NET.CoreRuntime.2.2.appx
Microsoft.UI.Xaml.2.5.appx
Microsoft.UI.Xaml.2.6.appx
Microsoft.VCLibs.x86.Debug.14.00.appx
2 changes: 1 addition & 1 deletion UITests/UITests.Tests.TAEF/UITests.App.dependencies.Release.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Microsoft.NET.Native.Framework.2.2.appx
Microsoft.NET.Native.Runtime.2.2.appx
Microsoft.UI.Xaml.2.5.appx
Microsoft.UI.Xaml.2.6.appx
Microsoft.VCLibs.x86.14.00.appx
2 changes: 1 addition & 1 deletion build/Windows.Toolkit.UWP.Controls.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
<PackageReference Include="Microsoft.UI.Xaml" Version="2.6.1" />
</ItemGroup>

<PropertyGroup>
Expand Down