From 952351194fd148de0d5e645a150ea2a0455b8680 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Wed, 16 Apr 2025 20:01:26 +0200
Subject: [PATCH 1/7] [1.8exp1] Adding new styles (#1835)

In 1.8, we are shipping new styles:

- SubtleButtonStyle for `Button`
- BodyLargeTextBlockStyle and BodyLargeStrongTextBlockStyle for
`TextBlock`

This PR adds the samples for those changes:


![image](https://github.com/user-attachments/assets/761834f8-8245-451e-8246-32397346557c)


![image](https://github.com/user-attachments/assets/9c6b4557-5445-4439-8c83-9137083bf917)
---
 WinUIGallery/App.xaml                         |  1 -
 .../DesignGuidance/TypographyControl.xaml     |  2 +-
 .../Samples/ControlPages/ButtonPage.xaml      | 38 +++++---
 .../ControlPages/Design/TypographyPage.xaml   | 22 ++++-
 WinUIGallery/Styles/Button.xaml               | 97 -------------------
 WinUIGallery/WinUIGallery.csproj              |  6 --
 standalone.props                              |  2 +-
 7 files changed, 45 insertions(+), 123 deletions(-)
 delete mode 100644 WinUIGallery/Styles/Button.xaml

diff --git a/WinUIGallery/App.xaml b/WinUIGallery/App.xaml
index e0e2d8e3d..5a23ad96d 100644
--- a/WinUIGallery/App.xaml
+++ b/WinUIGallery/App.xaml
@@ -21,7 +21,6 @@
                 <XamlControlsResources />
                 <local:ItemTemplates />
                 <ResourceDictionary Source="/Controls/CopyButton.xaml" />
-                <ResourceDictionary Source="/Styles/Button.xaml" />
                 <ResourceDictionary Source="/Styles/Grid.xaml" />
                 <ResourceDictionary Source="/Styles/GridViewItem.xaml" />
                 <ResourceDictionary Source="/Styles/TextBlock.xaml" />
diff --git a/WinUIGallery/Controls/DesignGuidance/TypographyControl.xaml b/WinUIGallery/Controls/DesignGuidance/TypographyControl.xaml
index 8b217904e..97de9c871 100644
--- a/WinUIGallery/Controls/DesignGuidance/TypographyControl.xaml
+++ b/WinUIGallery/Controls/DesignGuidance/TypographyControl.xaml
@@ -20,7 +20,7 @@
                 <ColumnDefinition Width="272" />
                 <ColumnDefinition Width="136" />
                 <ColumnDefinition Width="112" />
-                <ColumnDefinition Width="164" />
+                <ColumnDefinition Width="194" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <TextBlock
diff --git a/WinUIGallery/Samples/ControlPages/ButtonPage.xaml b/WinUIGallery/Samples/ControlPages/ButtonPage.xaml
index e3bfb671c..5aa7262a1 100644
--- a/WinUIGallery/Samples/ControlPages/ButtonPage.xaml
+++ b/WinUIGallery/Samples/ControlPages/ButtonPage.xaml
@@ -82,6 +82,29 @@
                 </x:String>
             </controls:ControlExample.Xaml>
         </-->
+
+        <controls:ControlExample HeaderText="Built-in styles applied to Button.">
+            <controls:ControlExample.Example>
+                <StackPanel Orientation="Horizontal" Spacing="16">
+                    <Button
+                        AutomationProperties.Name="Accent style"
+                        Content="Accent style button"
+                        Style="{StaticResource AccentButtonStyle}" />
+                    <Button
+                        AutomationProperties.Name="Subtle style"
+                        Content="Subtle style button"
+                        Style="{StaticResource SubtleButtonStyle}" />
+                </StackPanel>
+
+            </controls:ControlExample.Example>
+            <controls:ControlExample.Xaml>
+                <x:String>
+                    &lt;Button Style="{StaticResource AccentButtonStyle}" Content="Accent style button" /&gt;
+                    &lt;Button Style="{StaticResource SubtleButtonStyle}" Content="Subtle style button" /&gt;
+                </x:String>
+            </controls:ControlExample.Xaml>
+        </controls:ControlExample>
+
         <controls:ControlExample HeaderText="Wrapping Buttons with large content">
             <StackPanel>
                 <TextBlock
@@ -126,20 +149,5 @@
                 </x:String>
             </controls:ControlExample.Xaml>
         </controls:ControlExample>
-
-        <controls:ControlExample HeaderText="Accent style applied to Button.">
-            <controls:ControlExample.Example>
-                <Button
-                    AutomationProperties.Name="Accent style"
-                    Content="Accent style button"
-                    Style="{StaticResource AccentButtonStyle}" />
-            </controls:ControlExample.Example>
-            <controls:ControlExample.Xaml>
-                <x:String>
-                    &lt;Button Style="{StaticResource AccentButtonStyle}" Content="Accent style button" /&gt;
-                </x:String>
-            </controls:ControlExample.Xaml>
-        </controls:ControlExample>
-
     </StackPanel>
 </Page>
diff --git a/WinUIGallery/Samples/ControlPages/Design/TypographyPage.xaml b/WinUIGallery/Samples/ControlPages/Design/TypographyPage.xaml
index 894950e18..7384b4801 100644
--- a/WinUIGallery/Samples/ControlPages/Design/TypographyPage.xaml
+++ b/WinUIGallery/Samples/ControlPages/Design/TypographyPage.xaml
@@ -39,7 +39,7 @@
         </Grid.RowDefinitions>
         <RichTextBlock>
             <Paragraph>
-                Typography helps provide structure and hierarchy to UI. The default font for Windows is <Hyperlink NavigateUri="https://learn.microsoft.com/windows/apps/design/downloads/#fonts">Segoe UI Variable</Hyperlink>
+                Typography helps provide structure and hierarchy to UI. The default font for Windows is<Hyperlink NavigateUri="https://learn.microsoft.com/windows/apps/design/downloads/#fonts">Segoe UI Variable</Hyperlink>
                 .
                 Best practice is to use Regular weight for most text, use Semibold for titles. The minimum values should be 12px Regular, 14px Semibold.</Paragraph>
         </RichTextBlock>
@@ -158,7 +158,10 @@
                     </Canvas>
                 </ScrollViewer>
 
-                <ScrollViewer HorizontalScrollBarVisibility="Auto" HorizontalScrollMode="Auto" VerticalScrollBarVisibility="Hidden">
+                <ScrollViewer
+                    HorizontalScrollBarVisibility="Auto"
+                    HorizontalScrollMode="Auto"
+                    VerticalScrollBarVisibility="Hidden">
                     <StackPanel>
                         <Grid Margin="0,48,0,24" HorizontalAlignment="Stretch">
                             <Grid.ColumnDefinitions>
@@ -212,6 +215,21 @@
                             SizeLineHeight="14/20 epx"
                             VariableFont="Text, SemiBold"
                             Weight="600" />
+                        <controls:TypographyControl
+                            Example="Body Large"
+                            ExampleStyle="{StaticResource BodyLargeTextBlockStyle}"
+                            ResourceName="BodyLargeTextBlockStyle"
+                            SizeLineHeight="18/24 epx"
+                            VariableFont="Text, Regular"
+                            Weight="400" />
+                        <controls:TypographyControl
+                            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                            Example="Body Large Strong"
+                            ExampleStyle="{StaticResource BodyLargeStrongTextBlockStyle}"
+                            ResourceName="BodyLargeStrongTextBlockStyle"
+                            SizeLineHeight="18/24 epx"
+                            VariableFont="Text, SemiBold"
+                            Weight="600" />
                         <controls:TypographyControl
                             Example="Subtitle"
                             ExampleStyle="{StaticResource SubtitleTextBlockStyle}"
diff --git a/WinUIGallery/Styles/Button.xaml b/WinUIGallery/Styles/Button.xaml
deleted file mode 100644
index fa803731d..000000000
--- a/WinUIGallery/Styles/Button.xaml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <ResourceDictionary.MergedDictionaries>
-        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-        <!--  Other merged dictionaries here  -->
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style x:Key="SubtleButtonStyle" TargetType="Button">
-        <Setter Property="Background" Value="{ThemeResource SubtleFillColorTransparent}" />
-        <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
-        <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimary}" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-        <Setter Property="FocusVisualMargin" Value="-3" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <ContentPresenter
-                        x:Name="ContentPresenter"
-                        Padding="{TemplateBinding Padding}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        AnimatedIcon.State="Normal"
-                        AutomationProperties.AccessibilityView="Raw"
-                        Background="{TemplateBinding Background}"
-                        BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        Content="{TemplateBinding Content}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        ContentTransitions="{TemplateBinding ContentTransitions}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
-                        <ContentPresenter.BackgroundTransition>
-                            <BrushTransition Duration="0:0:0.083" />
-                        </ContentPresenter.BackgroundTransition>
-
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="PointerOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleFillColorSecondary}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorPrimary}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                    <VisualState.Setters>
-                                        <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="PointerOver" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleFillColorTertiary}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorSecondary}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                    <VisualState.Setters>
-                                        <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Pressed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ControlFillColorDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                    <VisualState.Setters>
-                                        <!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
-                                        <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Normal" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </ContentPresenter>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
diff --git a/WinUIGallery/WinUIGallery.csproj b/WinUIGallery/WinUIGallery.csproj
index 1e87d50d0..0cf586651 100644
--- a/WinUIGallery/WinUIGallery.csproj
+++ b/WinUIGallery/WinUIGallery.csproj
@@ -314,7 +314,6 @@
         <None Remove="Samples\Data\IconsData.json" />
         <None Remove="SamplePages\SampleBuiltInSystemBackdropsWindow.xaml" />
         <None Remove="Samples\SamplePages\SampleWindow2.xaml" />
-        <None Remove="Styles\Button.xaml" />
         <None Remove="Styles\Grid.xaml" />
         <None Remove="Styles\GridViewItem.xaml" />
         <None Remove="Styles\ItemTemplates.xaml" />
@@ -600,11 +599,6 @@
         <Generator>MSBuild:Compile</Generator>
       </Page>
     </ItemGroup>
-    <ItemGroup>
-      <Page Update="Styles\Button.xaml">
-        <Generator>MSBuild:Compile</Generator>
-      </Page>
-    </ItemGroup>
     <Import Project="ContentIncludes.props" />
     <!--Per comment in Microsoft.Common.CurrentVersion.targets, the default GetCopyToPublishDirectoryItems 
         just returns GetCopyToOutputDirectoryItems, which automatically includes the ContentWithTargetPath
diff --git a/standalone.props b/standalone.props
index 468ca5a54..ffce99f6c 100644
--- a/standalone.props
+++ b/standalone.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- The NuGet versions of dependencies to build against. -->
     <WindowsSdkPackageVersion>10.0.22621.42</WindowsSdkPackageVersion>
-    <WindowsAppSdkPackageVersion>1.7.250310001</WindowsAppSdkPackageVersion>
+    <WindowsAppSdkPackageVersion>1.8.250410001-experimental1</WindowsAppSdkPackageVersion>
     <MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
     <GraphicsWin2DVersion>1.3.2</GraphicsWin2DVersion>
     <ColorCodeVersion>2.0.15</ColorCodeVersion>

From b478364013627878362136f7dc0538d45f7de38d Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 5 May 2025 14:22:00 +0200
Subject: [PATCH 2/7] Update App.xaml

---
 WinUIGallery/App.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WinUIGallery/App.xaml b/WinUIGallery/App.xaml
index 5653a63fb..be3fffa12 100644
--- a/WinUIGallery/App.xaml
+++ b/WinUIGallery/App.xaml
@@ -21,7 +21,6 @@
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                 <local:ItemTemplates />
                 <ResourceDictionary Source="ms-appx:///Controls/CopyButton.xaml" />
-                <ResourceDictionary Source="ms-appx:///Styles/Button.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/Grid.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/GridViewItem.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/TextBlock.xaml" />

From b1b54fd545f381a4bcbe9d01a8a4062097fefda6 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 2 Jun 2025 12:48:43 +0200
Subject: [PATCH 3/7] Update standalone.props

---
 standalone.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/standalone.props b/standalone.props
index 6b533aae3..d63666347 100644
--- a/standalone.props
+++ b/standalone.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- The NuGet versions of dependencies to build against. -->
     <WindowsSdkPackageVersion>10.0.22621.42</WindowsSdkPackageVersion>
-    <WindowsAppSdkPackageVersion>1.8.250410001-experimental1</WindowsAppSdkPackageVersion>
+    <WindowsAppSdkPackageVersion>1.8.250515001-experimental2</WindowsAppSdkPackageVersion>
     <MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
     <GraphicsWin2DVersion>1.3.2</GraphicsWin2DVersion>
     <ColorCodeVersion>2.0.15</ColorCodeVersion>

From 6798aa04cc8ddb63b8deaffd04fc2e5e7709908b Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Wed, 6 Aug 2025 10:29:01 +0200
Subject: [PATCH 4/7] Removing Button.xaml

---
 WinUIGallery/App.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WinUIGallery/App.xaml b/WinUIGallery/App.xaml
index 6a308b095..df6b773b9 100644
--- a/WinUIGallery/App.xaml
+++ b/WinUIGallery/App.xaml
@@ -22,7 +22,6 @@
                 <local:ItemTemplates />
                 <ResourceDictionary Source="ms-appx:///Controls/CopyButton.xaml" />
                 <ResourceDictionary Source="ms-appx:///Controls/OpacityMaskView.xaml" />
-                <ResourceDictionary Source="ms-appx:///Styles/Button.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/Grid.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/GridViewItem.xaml" />
                 <ResourceDictionary Source="ms-appx:///Styles/TextBlock.xaml" />

From 5fc8915bbc963f95865bbb821fbebb3f35c2f7cc Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Wed, 6 Aug 2025 10:29:43 +0200
Subject: [PATCH 5/7] Upgrading to preview4

---
 standalone.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/standalone.props b/standalone.props
index d63666347..b10eb6ab9 100644
--- a/standalone.props
+++ b/standalone.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- The NuGet versions of dependencies to build against. -->
     <WindowsSdkPackageVersion>10.0.22621.42</WindowsSdkPackageVersion>
-    <WindowsAppSdkPackageVersion>1.8.250515001-experimental2</WindowsAppSdkPackageVersion>
+    <WindowsAppSdkPackageVersion>1.8.250702007-experimental4</WindowsAppSdkPackageVersion>
     <MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
     <GraphicsWin2DVersion>1.3.2</GraphicsWin2DVersion>
     <ColorCodeVersion>2.0.15</ColorCodeVersion>

From 55732fdb627a8858053e2231330ad4aadade4eac Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 2 Sep 2025 10:01:24 +0200
Subject: [PATCH 6/7] Upgrade to preview

---
 standalone.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/standalone.props b/standalone.props
index b10eb6ab9..3e2d29649 100644
--- a/standalone.props
+++ b/standalone.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- The NuGet versions of dependencies to build against. -->
     <WindowsSdkPackageVersion>10.0.22621.42</WindowsSdkPackageVersion>
-    <WindowsAppSdkPackageVersion>1.8.250702007-experimental4</WindowsAppSdkPackageVersion>
+    <WindowsAppSdkPackageVersion>1.8.250814004-preview</WindowsAppSdkPackageVersion>
     <MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
     <GraphicsWin2DVersion>1.3.2</GraphicsWin2DVersion>
     <ColorCodeVersion>2.0.15</ColorCodeVersion>

From 4054431ae2b57294b7123abf25e0d62ffae543cf Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 2 Sep 2025 15:13:49 +0200
Subject: [PATCH 7/7] Correct xaml styling error

---
 WinUIGallery/Samples/ControlPages/Design/TypographyPage.xaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WinUIGallery/Samples/ControlPages/Design/TypographyPage.xaml b/WinUIGallery/Samples/ControlPages/Design/TypographyPage.xaml
index 7384b4801..95ea34b43 100644
--- a/WinUIGallery/Samples/ControlPages/Design/TypographyPage.xaml
+++ b/WinUIGallery/Samples/ControlPages/Design/TypographyPage.xaml
@@ -39,8 +39,7 @@
         </Grid.RowDefinitions>
         <RichTextBlock>
             <Paragraph>
-                Typography helps provide structure and hierarchy to UI. The default font for Windows is<Hyperlink NavigateUri="https://learn.microsoft.com/windows/apps/design/downloads/#fonts">Segoe UI Variable</Hyperlink>
-                .
+                Typography helps provide structure and hierarchy to UI. The default font for Windows is <Hyperlink NavigateUri="https://learn.microsoft.com/windows/apps/design/downloads/#fonts">Segoe UI Variable</Hyperlink>.
                 Best practice is to use Regular weight for most text, use Semibold for titles. The minimum values should be 12px Regular, 14px Semibold.</Paragraph>
         </RichTextBlock>
         <controls:ControlExample