From 1cd7f34a65fbb1346851b684cbbfcdcde5725a47 Mon Sep 17 00:00:00 2001
From: Peter <szpeter@yeah.net>
Date: Thu, 18 Jul 2024 23:47:16 +0800
Subject: [PATCH 1/2] Proof of Concept: AppWindowPresenter page

---
 WinUIGallery/ControlPages/AppWindowPage.xaml  | 38 ++++++++++
 .../ControlPages/AppWindowPage.xaml.cs        | 58 ++++++++++++++
 WinUIGallery/DataModel/ControlInfoData.json   | 58 +++++++++-----
 .../SampleCompactOverlayPresenterWindow.xaml  | 15 ++++
 ...ampleCompactOverlayPresenterWindow.xaml.cs | 47 ++++++++++++
 .../SampleFullScreenPresenterWindow.xaml      | 14 ++++
 .../SampleFullScreenPresenterWindow.xaml.cs   | 38 ++++++++++
 .../SampleOverlappedPresenterWindow.xaml      | 20 +++++
 .../SampleOverlappedPresenterWindow.xaml.cs   | 76 +++++++++++++++++++
 WinUIGallery/WinUIGallery.csproj              | 24 ++++++
 10 files changed, 368 insertions(+), 20 deletions(-)
 create mode 100644 WinUIGallery/ControlPages/AppWindowPage.xaml
 create mode 100644 WinUIGallery/ControlPages/AppWindowPage.xaml.cs
 create mode 100644 WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml
 create mode 100644 WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml.cs
 create mode 100644 WinUIGallery/SamplePages/SampleFullScreenPresenterWindow.xaml
 create mode 100644 WinUIGallery/SamplePages/SampleFullScreenPresenterWindow.xaml.cs
 create mode 100644 WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml
 create mode 100644 WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml.cs

diff --git a/WinUIGallery/ControlPages/AppWindowPage.xaml b/WinUIGallery/ControlPages/AppWindowPage.xaml
new file mode 100644
index 000000000..1ec91a383
--- /dev/null
+++ b/WinUIGallery/ControlPages/AppWindowPage.xaml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Page
+    x:Class="WinUIGallery.ControlPages.AppWindowPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:WinUIGallery"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <StackPanel>
+        <local:ControlExample HeaderText="AppWindow with OverlappedPresenter">
+            <Button Click="Button_Click">Create new Window with OverlappedPresenter</Button>
+            <local:ControlExample.Options>
+                <ToggleSwitch Header="ExtendsContentIntoTitleBar" x:Name="ExtendContent1"/>
+            </local:ControlExample.Options>
+        </local:ControlExample>
+
+        <local:ControlExample HeaderText="AppWindow with FullScreenPresenter">
+            <Button x:Name="CreateWithFullScreenPresenterButton" Click="CreateWithFullScreenPresenterButton_Click">
+                Create new Window with FullScreenPresenter
+            </Button>
+        </local:ControlExample>
+
+        <local:ControlExample HeaderText="AppWindow with CompactOverlayPresenter">
+            <DropDownButton x:Name="CreateWithCompactOverlayPresenterButton">
+                Create new Window with CompactOverlayPresenter
+                <DropDownButton.Flyout>
+                    <MenuFlyout Placement="Bottom">
+                        <MenuFlyoutItem Text="Large size" Tag="Large" Click="CreateWithCompactOverlayPresenterMenu_Click"/>
+                        <MenuFlyoutItem Text="Medium size" Tag="Medium" Click="CreateWithCompactOverlayPresenterMenu_Click"/>
+                        <MenuFlyoutItem Text="Small size" Tag="Small" Click="CreateWithCompactOverlayPresenterMenu_Click"/>
+                    </MenuFlyout>
+                </DropDownButton.Flyout>
+            </DropDownButton>
+        </local:ControlExample>
+    </StackPanel>
+</Page>
diff --git a/WinUIGallery/ControlPages/AppWindowPage.xaml.cs b/WinUIGallery/ControlPages/AppWindowPage.xaml.cs
new file mode 100644
index 000000000..30534c757
--- /dev/null
+++ b/WinUIGallery/ControlPages/AppWindowPage.xaml.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using WinUIGallery.SamplePages;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace WinUIGallery.ControlPages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class AppWindowPage : Page
+    {
+        public AppWindowPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            new SampleOverlappedPresenterWindow().Activate();
+        }
+
+        private void CreateWithFullScreenPresenterButton_Click(object sender, RoutedEventArgs e)
+        {
+            new SampleFullScreenPresenterWindow().Activate();
+        }
+
+        private void CreateWithCompactOverlayPresenterMenu_Click(object sender, RoutedEventArgs e)
+        {
+            switch((sender as MenuFlyoutItem).Tag)
+            {
+                case "Large":
+                    new SampleCompactOverlayPresenterWindow(Microsoft.UI.Windowing.CompactOverlaySize.Large).Activate();
+                    break;
+                case "Medium":
+                    new SampleCompactOverlayPresenterWindow(Microsoft.UI.Windowing.CompactOverlaySize.Medium).Activate();
+                    break;
+                case "Small":
+                    new SampleCompactOverlayPresenterWindow(Microsoft.UI.Windowing.CompactOverlaySize.Small).Activate();
+                    break;
+            }
+        }
+    }
+}
diff --git a/WinUIGallery/DataModel/ControlInfoData.json b/WinUIGallery/DataModel/ControlInfoData.json
index 43bcb5cd3..42efa0c4c 100644
--- a/WinUIGallery/DataModel/ControlInfoData.json
+++ b/WinUIGallery/DataModel/ControlInfoData.json
@@ -2843,26 +2843,44 @@
           ]
         },
         {
-          "UniqueId": "TitleBar",
-          "Title": "TitleBar",
-          "ApiNamespace": "Microsoft.UI.Xaml",
-          "Subtitle": "An example showing a custom UIElement used as the titlebar for the app's window.",
-          "ImagePath": "ms-appx:///Assets/ControlImages/TitleBar.png",
-          "Description": "This sample shows how to use a custom titlebar for the app's window. There are 2 ways of doing it: using default titlebar and setting an UIElement as a custom titlebar.",
-          "Content": "<p>Look at the <i>TitleBarPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
-          "IsUpdated": true,
-          "Docs": [
-            {
-              "Title": "TitleBar - API",
-              "Uri": "https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.window.extendscontentintotitlebar"
-            },
-            {
-              "Title": "Guidelines",
-              "Uri": "https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.window"
-            }
-          ],
-          "RelatedControls": [
-          ]
+            "UniqueId": "TitleBar",
+            "Title": "TitleBar",
+            "ApiNamespace": "Microsoft.UI.Xaml",
+            "Subtitle": "An example showing a custom UIElement used as the titlebar for the app's window.",
+            "ImagePath": "ms-appx:///Assets/ControlImages/TitleBar.png",
+            "Description": "This sample shows how to use a custom titlebar for the app's window. There are 2 ways of doing it: using default titlebar and setting an UIElement as a custom titlebar.",
+            "Content": "<p>Look at the <i>TitleBarPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
+            "IsUpdated": true,
+            "Docs": [
+                {
+                    "Title": "TitleBar - API",
+                    "Uri": "https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.window.extendscontentintotitlebar"
+                },
+                {
+                    "Title": "Guidelines",
+                    "Uri": "https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.window"
+                }
+            ],
+            "RelatedControls": [
+            ]
+        },
+        {
+            "UniqueId": "AppWindow",
+            "Title": "AppWindow",
+            "ApiNamespace": "Microsoft.UI.Windowing",
+            "Subtitle": "",
+            "ImagePath": "ms-appx:///Assets/ControlImages/TitleBar.png",
+            "Description": "This sample shows different functionalities of AppWindow and its corresponding Presenter.",
+            "Docs": [
+                {
+                    "Title": "AppWindow - API",
+                    "Uri": "https://learn.microsoft.com/en-us/windows/windows-app-sdk/api/winrt/microsoft.ui.windowing.appwindow"
+                },
+                {
+                    "Title": "OverlappedPresenter - API",
+                    "Uri": "https://learn.microsoft.com/en-us/windows/windows-app-sdk/api/winrt/microsoft.ui.windowing.overlappedpresenter"
+                }
+            ]
         }
       ]
     },
diff --git a/WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml b/WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml
new file mode 100644
index 000000000..80d71b529
--- /dev/null
+++ b/WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Window
+    x:Class="WinUIGallery.SamplePages.SampleCompactOverlayPresenterWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:WinUIGallery.SamplePages"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16">
+        Current CompactOverlaySize: 
+        <Run x:Name="SizeText"/>
+    </TextBlock>
+</Window>
diff --git a/WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml.cs b/WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml.cs
new file mode 100644
index 000000000..cf868342b
--- /dev/null
+++ b/WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace WinUIGallery.SamplePages
+{
+    /// <summary>
+    /// An empty window that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class SampleCompactOverlayPresenterWindow : Window
+    {
+        public SampleCompactOverlayPresenterWindow(CompactOverlaySize size)
+        {
+            this.InitializeComponent();
+            var presenter = CompactOverlayPresenter.Create();
+            presenter.InitialSize = size;
+            AppWindow.SetPresenter(presenter);
+            SizeText.Text = sizeText(size);
+        }
+
+        private static string sizeText(CompactOverlaySize size)
+        {
+            switch (size)
+            {
+                case CompactOverlaySize.Large: return "Large";
+                case CompactOverlaySize.Medium: return "Medium";
+                case CompactOverlaySize.Small: return "Small";
+            }
+            return "";
+        }
+    }
+}
diff --git a/WinUIGallery/SamplePages/SampleFullScreenPresenterWindow.xaml b/WinUIGallery/SamplePages/SampleFullScreenPresenterWindow.xaml
new file mode 100644
index 000000000..96380c8c3
--- /dev/null
+++ b/WinUIGallery/SamplePages/SampleFullScreenPresenterWindow.xaml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Window
+    x:Class="WinUIGallery.SamplePages.SampleFullScreenPresenterWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:WinUIGallery.SamplePages"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid>
+        <Button HorizontalAlignment="Center" VerticalAlignment="Center" x:Name="CloseWindowButton" Click="CloseWindowButton_Click">Close Window</Button>
+    </Grid>
+</Window>
diff --git a/WinUIGallery/SamplePages/SampleFullScreenPresenterWindow.xaml.cs b/WinUIGallery/SamplePages/SampleFullScreenPresenterWindow.xaml.cs
new file mode 100644
index 000000000..9c1de5b79
--- /dev/null
+++ b/WinUIGallery/SamplePages/SampleFullScreenPresenterWindow.xaml.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Microsoft.UI.Windowing;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace WinUIGallery.SamplePages
+{
+    /// <summary>
+    /// An empty window that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class SampleFullScreenPresenterWindow : Window
+    {
+        public SampleFullScreenPresenterWindow()
+        {
+            this.InitializeComponent();
+            AppWindow.SetPresenter(FullScreenPresenter.Create());
+        }
+
+        private void CloseWindowButton_Click(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+    }
+}
diff --git a/WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml b/WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml
new file mode 100644
index 000000000..6f64fea6f
--- /dev/null
+++ b/WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Window
+    x:Class="WinUIGallery.SamplePages.SampleOverlappedPresenterWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:WinUIGallery.SamplePages"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <StackPanel Spacing="5">
+        <ToggleSwitch Header="HasBorder" IsOn="{x:Bind HasBorder, Mode=TwoWay}"/>
+        <ToggleSwitch Header="HasTitleBar" IsOn="{x:Bind HasTitleBar, Mode=TwoWay}"/>
+        <ToggleSwitch Header="IsAlwaysOnTop" IsOn="{x:Bind IsAlwaysOnTop, Mode=TwoWay}"/>
+        <ToggleSwitch Header="IsMaximizable" IsOn="{x:Bind IsMaximizable, Mode=TwoWay}"/>
+        <ToggleSwitch Header="IsMinimizable" IsOn="{x:Bind IsAlwaysOnTop, Mode=TwoWay}"/>
+        <ToggleSwitch Header="IsModal" IsOn="{x:Bind IsModal, Mode=TwoWay}"/>
+        <ToggleSwitch Header="IsResizable" IsOn="{x:Bind IsResizable, Mode=TwoWay}"/>
+    </StackPanel>
+</Window>
diff --git a/WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml.cs b/WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml.cs
new file mode 100644
index 000000000..19e9b6d59
--- /dev/null
+++ b/WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace WinUIGallery.SamplePages
+{
+    /// <summary>
+    /// An empty window that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class SampleOverlappedPresenterWindow : Window
+    {
+        OverlappedPresenter presenter;
+        public SampleOverlappedPresenterWindow()
+        {
+            this.InitializeComponent();
+            presenter = AppWindow.Presenter as OverlappedPresenter;
+        }
+
+        public bool HasBorder
+        {
+            get => presenter.HasBorder;
+            set => presenter.SetBorderAndTitleBar(value, HasTitleBar);
+        }
+
+        public bool HasTitleBar
+        {
+            get => presenter.HasTitleBar;
+            set => presenter.SetBorderAndTitleBar(HasBorder, value);
+        }
+
+        public bool IsAlwaysOnTop
+        {
+            get => presenter.IsAlwaysOnTop;
+            set => presenter.IsAlwaysOnTop = value;
+        }
+
+        public bool IsMaximizable
+        {
+            get => presenter.IsMaximizable;
+            set => presenter.IsMaximizable = value;
+        }
+
+        public bool IsMinimizable
+        {
+            get => presenter.IsMinimizable;
+            set => presenter.IsMinimizable = value;
+        }
+
+        public bool IsModal
+        {
+            get => presenter.IsModal;
+            set => presenter.IsModal = value;
+        }
+
+        public bool IsResizable
+        {
+            get => presenter.IsResizable;
+            set => presenter.IsResizable = value;
+        }
+    }
+}
diff --git a/WinUIGallery/WinUIGallery.csproj b/WinUIGallery/WinUIGallery.csproj
index 8b66b6f05..34dc6a5ac 100644
--- a/WinUIGallery/WinUIGallery.csproj
+++ b/WinUIGallery/WinUIGallery.csproj
@@ -151,6 +151,7 @@
         <None Remove="ControlPagesSampleCode\Geometry\GeometrySample_xaml.txt" />
         <None Remove="ControlPagesSampleCode\Icons\FontIconSample2_xaml.txt" />
         <None Remove="ControlPagesSampleCode\Typography\TypographySample_xaml.txt" />
+        <None Remove="ControlPages\AppWindowPage.xaml" />
         <None Remove="ControlPages\DesignGuidance\ColorPage.xaml" />
         <None Remove="ControlPages\DesignGuidance\SpacingPage.xaml" />
         <None Remove="ControlPages\InfoBadgePage.xaml" />
@@ -170,6 +171,9 @@
         <None Remove="Controls\SampleThemeListener.xaml" />
         <None Remove="DataModel\IconsData.json" />
         <None Remove="SamplePages\SampleBuiltInSystemBackdropsWindow.xaml" />
+        <None Remove="SamplePages\SampleCompactOverlayPresenterWindow.xaml" />
+        <None Remove="SamplePages\SampleFullScreenPresenterWindow.xaml" />
+        <None Remove="SamplePages\SampleOverlappedPresenterWindow.xaml" />
     </ItemGroup>
 
     <ItemGroup>
@@ -292,6 +296,26 @@
     <ItemGroup>
       <Folder Include="ControlPages\Accessibility\" />
     </ItemGroup>
+    <ItemGroup>
+      <Page Update="SamplePages\SampleFullScreenPresenterWindow.xaml">
+        <Generator>MSBuild:Compile</Generator>
+      </Page>
+    </ItemGroup>
+    <ItemGroup>
+      <Page Update="SamplePages\SampleCompactOverlayPresenterWindow.xaml">
+        <Generator>MSBuild:Compile</Generator>
+      </Page>
+    </ItemGroup>
+    <ItemGroup>
+      <Page Update="SamplePages\SampleOverlappedPresenterWindow.xaml">
+        <Generator>MSBuild:Compile</Generator>
+      </Page>
+    </ItemGroup>
+    <ItemGroup>
+      <Page Update="ControlPages\AppWindowPage.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

From e9694493b42ca06034e7693f2d26415ec2d0dcc4 Mon Sep 17 00:00:00 2001
From: Peter <szpeter@yeah.net>
Date: Sat, 20 Jul 2024 03:24:19 +0800
Subject: [PATCH 2/2] Add ExtendsContentIntoTitleBar in all
 AppPresenterSampleWindow

---
 WinUIGallery/ControlPages/AppWindowPage.xaml  |  3 -
 .../SampleCompactOverlayPresenterWindow.xaml  | 13 +++--
 ...ampleCompactOverlayPresenterWindow.xaml.cs |  5 ++
 .../SampleOverlappedPresenterWindow.xaml      |  6 +-
 .../SampleOverlappedPresenterWindow.xaml.cs   | 55 +++++++++++++++++--
 5 files changed, 69 insertions(+), 13 deletions(-)

diff --git a/WinUIGallery/ControlPages/AppWindowPage.xaml b/WinUIGallery/ControlPages/AppWindowPage.xaml
index 1ec91a383..48e0c31cc 100644
--- a/WinUIGallery/ControlPages/AppWindowPage.xaml
+++ b/WinUIGallery/ControlPages/AppWindowPage.xaml
@@ -11,9 +11,6 @@
     <StackPanel>
         <local:ControlExample HeaderText="AppWindow with OverlappedPresenter">
             <Button Click="Button_Click">Create new Window with OverlappedPresenter</Button>
-            <local:ControlExample.Options>
-                <ToggleSwitch Header="ExtendsContentIntoTitleBar" x:Name="ExtendContent1"/>
-            </local:ControlExample.Options>
         </local:ControlExample>
 
         <local:ControlExample HeaderText="AppWindow with FullScreenPresenter">
diff --git a/WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml b/WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml
index 80d71b529..f5fc5cdf7 100644
--- a/WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml
+++ b/WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml
@@ -8,8 +8,13 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16">
-        Current CompactOverlaySize: 
-        <Run x:Name="SizeText"/>
-    </TextBlock>
+    <StackPanel Spacing="20" VerticalAlignment="Center">
+        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16">
+            Current CompactOverlaySize: 
+            <Run x:Name="SizeText"/>
+        </TextBlock>
+
+        <ToggleButton Click="ToggleButton_Click" HorizontalAlignment="Center">ExtendsContentIntoTitleBar</ToggleButton>
+    </StackPanel>
+
 </Window>
diff --git a/WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml.cs b/WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml.cs
index cf868342b..d57f6c684 100644
--- a/WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml.cs
+++ b/WinUIGallery/SamplePages/SampleCompactOverlayPresenterWindow.xaml.cs
@@ -43,5 +43,10 @@ private static string sizeText(CompactOverlaySize size)
             }
             return "";
         }
+
+        private void ToggleButton_Click(object sender, RoutedEventArgs e)
+        {
+            ExtendsContentIntoTitleBar = !ExtendsContentIntoTitleBar;
+        }
     }
 }
diff --git a/WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml b/WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml
index 6f64fea6f..4b399e8b1 100644
--- a/WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml
+++ b/WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml
@@ -8,13 +8,15 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <StackPanel Spacing="5">
+    <StackPanel Spacing="5" HorizontalAlignment="Center" VerticalAlignment="Center">
         <ToggleSwitch Header="HasBorder" IsOn="{x:Bind HasBorder, Mode=TwoWay}"/>
         <ToggleSwitch Header="HasTitleBar" IsOn="{x:Bind HasTitleBar, Mode=TwoWay}"/>
         <ToggleSwitch Header="IsAlwaysOnTop" IsOn="{x:Bind IsAlwaysOnTop, Mode=TwoWay}"/>
         <ToggleSwitch Header="IsMaximizable" IsOn="{x:Bind IsMaximizable, Mode=TwoWay}"/>
-        <ToggleSwitch Header="IsMinimizable" IsOn="{x:Bind IsAlwaysOnTop, Mode=TwoWay}"/>
+        <ToggleSwitch Header="IsMinimizable" IsOn="{x:Bind IsMinimizable, Mode=TwoWay}"/>
         <ToggleSwitch Header="IsModal" IsOn="{x:Bind IsModal, Mode=TwoWay}"/>
         <ToggleSwitch Header="IsResizable" IsOn="{x:Bind IsResizable, Mode=TwoWay}"/>
+
+        <ToggleButton Click="ToggleButton_Click" HorizontalAlignment="Center" Margin="0,20">ExtendsContentIntoTitleBar</ToggleButton>
     </StackPanel>
 </Window>
diff --git a/WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml.cs b/WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml.cs
index 19e9b6d59..3f343b53d 100644
--- a/WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml.cs
+++ b/WinUIGallery/SamplePages/SampleOverlappedPresenterWindow.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
@@ -22,25 +23,50 @@ namespace WinUIGallery.SamplePages
     /// <summary>
     /// An empty window that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class SampleOverlappedPresenterWindow : Window
+    public sealed partial class SampleOverlappedPresenterWindow : Window, INotifyPropertyChanged
     {
         OverlappedPresenter presenter;
+        public event PropertyChangedEventHandler PropertyChanged;
         public SampleOverlappedPresenterWindow()
         {
-            this.InitializeComponent();
             presenter = AppWindow.Presenter as OverlappedPresenter;
+            this.InitializeComponent();
         }
 
         public bool HasBorder
         {
             get => presenter.HasBorder;
-            set => presenter.SetBorderAndTitleBar(value, HasTitleBar);
+            set
+            {
+                try
+                {
+                    presenter.SetBorderAndTitleBar(value, HasTitleBar);
+                }
+                catch (Exception e)
+                {
+                    ShowExceptionDialog(e.Message);
+                }
+                NotifyPropertyChanged("HasBorder");
+                NotifyPropertyChanged("HasTitleBar");
+            }
         }
 
         public bool HasTitleBar
         {
             get => presenter.HasTitleBar;
-            set => presenter.SetBorderAndTitleBar(HasBorder, value);
+            set
+            {
+                try
+                {
+                    presenter.SetBorderAndTitleBar(HasBorder, value);
+                }
+                catch (Exception e)
+                {
+                    ShowExceptionDialog(e.Message);
+                }
+                NotifyPropertyChanged("HasTitleBar");
+                NotifyPropertyChanged("HasBorder");
+            }
         }
 
         public bool IsAlwaysOnTop
@@ -72,5 +98,26 @@ public bool IsResizable
             get => presenter.IsResizable;
             set => presenter.IsResizable = value;
         }
+
+        private void ToggleButton_Click(object sender, RoutedEventArgs e)
+        {
+            ExtendsContentIntoTitleBar = !ExtendsContentIntoTitleBar;
+        }
+
+        private void NotifyPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+        
+        private void ShowExceptionDialog(string message)
+        {
+            new ContentDialog()
+            {
+                XamlRoot = this.Content.XamlRoot,
+                Title = "Exception thrown",
+                Content = message,
+                PrimaryButtonText = "OK",
+            }.ShowAsync();
+        }
     }
 }