From d2b311d192a9b520349f2e07124e6283c4867b11 Mon Sep 17 00:00:00 2001
From: michaelpduda <michael@pulselyre.com>
Date: Fri, 7 Jun 2024 18:46:36 -0700
Subject: [PATCH 1/5] Fixes fullscreen window styling

---
 source/UpbeatUI/View/UpbeatMainWindow.xaml | 25 ----------------------
 1 file changed, 25 deletions(-)

diff --git a/source/UpbeatUI/View/UpbeatMainWindow.xaml b/source/UpbeatUI/View/UpbeatMainWindow.xaml
index a79e0eb..c4cbed9 100644
--- a/source/UpbeatUI/View/UpbeatMainWindow.xaml
+++ b/source/UpbeatUI/View/UpbeatMainWindow.xaml
@@ -14,31 +14,6 @@
     d:DesignHeight="500"
     d:DesignWidth="500">
     <Grid>
-        <Grid.Style>
-            <Style TargetType="Grid">
-                <Setter
-                    Property="Margin"
-                    Value="0" />
-                <Style.Triggers>
-                    <MultiDataTrigger>
-                        <MultiDataTrigger.Conditions>
-                            <Condition
-                                Binding="{Binding ElementName=_upbeatMainWindow, Path=ResizeMode}"
-                                Value="NoResize" />
-                            <Condition
-                                Binding="{Binding ElementName=_upbeatMainWindow, Path=WindowState}"
-                                Value="Maximized" />
-                            <Condition
-                                Binding="{Binding ElementName=_upbeatMainWindow, Path=WindowStyle}"
-                                Value="None" />
-                        </MultiDataTrigger.Conditions>
-                        <Setter
-                            Property="Margin"
-                            Value="8" />
-                    </MultiDataTrigger>
-                </Style.Triggers>
-            </Style>
-        </Grid.Style>
         <ItemsControl
             ItemsSource="{Binding ViewModels}"
             Focusable="False">

From 71f28941dd0a84e5fe6abef5e4fc1bf7530ca756 Mon Sep 17 00:00:00 2001
From: michaelpduda <michael@pulselyre.com>
Date: Fri, 7 Jun 2024 18:47:05 -0700
Subject: [PATCH 2/5] Adds convenience DependencyProperty for Fullscreen to
 UpbeatMainWindow

---
 source/UpbeatUI/View/UpbeatMainWindow.xaml.cs | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/source/UpbeatUI/View/UpbeatMainWindow.xaml.cs b/source/UpbeatUI/View/UpbeatMainWindow.xaml.cs
index b1ee655..5bc3a01 100644
--- a/source/UpbeatUI/View/UpbeatMainWindow.xaml.cs
+++ b/source/UpbeatUI/View/UpbeatMainWindow.xaml.cs
@@ -13,6 +13,16 @@ namespace UpbeatUI.View
     /// </summary>
     public partial class UpbeatMainWindow : Window
     {
+        /// <summary>
+        /// Identifies the <see cref="Fullscreen"/> <see cref="DependencyProperty"/>.
+        /// </summary>
+        public readonly static DependencyProperty FullscreenProperty =
+            DependencyProperty.Register(
+                "Fullscreen",
+                typeof(bool),
+                typeof(UpbeatMainWindow),
+                new FrameworkPropertyMetadata(false, HandleFullscreenPropertyChanged));
+
         /// <summary>
         /// Identifies the <see cref="ModalBackground"/> <see cref="DependencyProperty"/>.
         /// </summary>
@@ -35,6 +45,15 @@ public partial class UpbeatMainWindow : Window
         public UpbeatMainWindow() =>
             InitializeComponent();
 
+        /// <summary>
+        /// Gets or sets whether the <see cref="UpbeatMainWindow"/> is in fullscreen mode or not.
+        /// </summary>
+        public bool Fullscreen
+        {
+            get => (bool)GetValue(FullscreenProperty);
+            set => SetValue(FullscreenProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets a <see cref="Brush"/> that the <see cref="ModalPanel"/> will show underneath the top (active) Element.
         /// </summary>
@@ -52,5 +71,24 @@ public BlurEffect ModalBlurEffect
             get => (BlurEffect)GetValue(ModalBlurEffectProprety);
             set => SetValue(ModalBlurEffectProprety, value);
         }
+
+        private static void HandleFullscreenPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is UpbeatMainWindow upbeatMainWindow)
+            {
+                if (upbeatMainWindow.Fullscreen)
+                {
+                    upbeatMainWindow.ResizeMode = ResizeMode.NoResize;
+                    upbeatMainWindow.WindowStyle = WindowStyle.None;
+                    upbeatMainWindow.WindowState = WindowState.Maximized;
+                }
+                else
+                {
+                    upbeatMainWindow.WindowState = WindowState.Normal;
+                    upbeatMainWindow.WindowStyle = WindowStyle.SingleBorderWindow;
+                    upbeatMainWindow.ResizeMode = ResizeMode.CanResize;
+                }
+            }
+        }
     }
 }

From e4bc6ddb471273c15fd391f7cee6c3b6ac539945 Mon Sep 17 00:00:00 2001
From: michaelpduda <michael@pulselyre.com>
Date: Fri, 7 Jun 2024 18:47:13 -0700
Subject: [PATCH 3/5] Adds fullscreen toggle to samples

---
 samples/HostedUpbeatUISample/View/MenuTemplate.xaml          | 3 +++
 samples/ManualUpbeatUISample/View/MenuTemplate.xaml          | 3 +++
 samples/ServiceProvidedUpbeatUISample/View/MenuTemplate.xaml | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/samples/HostedUpbeatUISample/View/MenuTemplate.xaml b/samples/HostedUpbeatUISample/View/MenuTemplate.xaml
index 9ec24c2..9fe4c7a 100644
--- a/samples/HostedUpbeatUISample/View/MenuTemplate.xaml
+++ b/samples/HostedUpbeatUISample/View/MenuTemplate.xaml
@@ -44,6 +44,9 @@
                     <Button
                         Command="{Binding OpenSharedListCommand}"
                         Margin="5">Shared List</Button>
+                    <ToggleButton
+                        IsChecked="{Binding Fullscreen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type uv:UpbeatMainWindow}}}"
+                        Margin="5">Fullscreen</ToggleButton>
                     <TextBlock
                         TextAlignment="Center"
                         Margin="5"
diff --git a/samples/ManualUpbeatUISample/View/MenuTemplate.xaml b/samples/ManualUpbeatUISample/View/MenuTemplate.xaml
index bf3215a..427de69 100644
--- a/samples/ManualUpbeatUISample/View/MenuTemplate.xaml
+++ b/samples/ManualUpbeatUISample/View/MenuTemplate.xaml
@@ -44,6 +44,9 @@
                     <Button
                         Command="{Binding OpenSharedListCommand}"
                         Margin="5">Shared List</Button>
+                    <ToggleButton
+                        IsChecked="{Binding Fullscreen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type uv:UpbeatMainWindow}}}"
+                        Margin="5">Fullscreen</ToggleButton>
                     <TextBlock
                         TextAlignment="Center"
                         Margin="5"
diff --git a/samples/ServiceProvidedUpbeatUISample/View/MenuTemplate.xaml b/samples/ServiceProvidedUpbeatUISample/View/MenuTemplate.xaml
index cb11b8e..fe826bc 100644
--- a/samples/ServiceProvidedUpbeatUISample/View/MenuTemplate.xaml
+++ b/samples/ServiceProvidedUpbeatUISample/View/MenuTemplate.xaml
@@ -44,6 +44,9 @@
                     <Button
                         Command="{Binding OpenSharedListCommand}"
                         Margin="5">Shared List</Button>
+                    <ToggleButton
+                        IsChecked="{Binding Fullscreen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type uv:UpbeatMainWindow}}}"
+                        Margin="5">Fullscreen</ToggleButton>
                     <TextBlock
                         TextAlignment="Center"
                         Margin="5"

From 8da77e6b4d396f716a905e70c5cd2c5d9351387a Mon Sep 17 00:00:00 2001
From: michaelpduda <michael@pulselyre.com>
Date: Sat, 8 Jun 2024 10:22:56 -0700
Subject: [PATCH 4/5] Adds property to control content margin when fullscreen

---
 source/UpbeatUI/View/UpbeatMainWindow.xaml    | 14 +++++++++++++
 source/UpbeatUI/View/UpbeatMainWindow.xaml.cs | 21 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/source/UpbeatUI/View/UpbeatMainWindow.xaml b/source/UpbeatUI/View/UpbeatMainWindow.xaml
index c4cbed9..31a7347 100644
--- a/source/UpbeatUI/View/UpbeatMainWindow.xaml
+++ b/source/UpbeatUI/View/UpbeatMainWindow.xaml
@@ -14,6 +14,20 @@
     d:DesignHeight="500"
     d:DesignWidth="500">
     <Grid>
+        <Grid.Style>
+            <Style TargetType="Grid">
+                <Setter
+                    Property="Margin"
+                    Value="0" />
+                <Style.Triggers>
+                    <DataTrigger Binding="{Binding Fullscreen, ElementName=_upbeatMainWindow}" Value="True">
+                        <Setter
+                            Property="Margin"
+                            Value="{Binding FullscreenContentMargin, ElementName=_upbeatMainWindow}" />
+                    </DataTrigger>
+                </Style.Triggers>
+            </Style>
+        </Grid.Style>
         <ItemsControl
             ItemsSource="{Binding ViewModels}"
             Focusable="False">
diff --git a/source/UpbeatUI/View/UpbeatMainWindow.xaml.cs b/source/UpbeatUI/View/UpbeatMainWindow.xaml.cs
index 5bc3a01..be22ca3 100644
--- a/source/UpbeatUI/View/UpbeatMainWindow.xaml.cs
+++ b/source/UpbeatUI/View/UpbeatMainWindow.xaml.cs
@@ -23,6 +23,16 @@ public partial class UpbeatMainWindow : Window
                 typeof(UpbeatMainWindow),
                 new FrameworkPropertyMetadata(false, HandleFullscreenPropertyChanged));
 
+        /// <summary>
+        /// Identifies the <see cref="FullscreenContentMargin"/> <see cref="DependencyProperty"/>.
+        /// </summary>
+        public readonly static DependencyProperty FullscreenContentMarginProperty =
+            DependencyProperty.Register(
+                "FullscreenContentMargin",
+                typeof(Thickness),
+                typeof(UpbeatMainWindow),
+                new FrameworkPropertyMetadata(new Thickness(0)));
+
         /// <summary>
         /// Identifies the <see cref="ModalBackground"/> <see cref="DependencyProperty"/>.
         /// </summary>
@@ -54,6 +64,17 @@ public bool Fullscreen
             set => SetValue(FullscreenProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the <see cref="UpbeatMainWindow"/>'s content margin when in fullscreen mode.
+        /// <para>Under certain <see cref="Window"/> styling conditions and when in fullscreen mode, the content might be rendered outside the visible area of the screen. This property allows you to counteract that behavior by adding margin to the content to shrink its rendered size (or subtracting margin to increase the rendered size).</para>
+        /// <para>This property has no effect when in windowed (non-fullscreen) mode.</para>
+        /// </summary>
+        public Thickness FullscreenContentMargin
+        {
+            get => (Thickness)GetValue(FullscreenContentMarginProperty);
+            set => SetValue(FullscreenContentMarginProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets a <see cref="Brush"/> that the <see cref="ModalPanel"/> will show underneath the top (active) Element.
         /// </summary>

From b8a3198691830a7a69da7b110016d2ad83504eef Mon Sep 17 00:00:00 2001
From: michaelpduda <michael@pulselyre.com>
Date: Sat, 8 Jun 2024 10:25:33 -0700
Subject: [PATCH 5/5] Updates versions for release candidate

---
 .../UpbeatUI.Extensions.DependencyInjection.csproj              | 2 +-
 .../UpbeatUI.Extensions.Hosting.csproj                          | 2 +-
 source/UpbeatUI/UpbeatUI.csproj                                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/UpbeatUI.Extensions.DependencyInjection/UpbeatUI.Extensions.DependencyInjection.csproj b/source/UpbeatUI.Extensions.DependencyInjection/UpbeatUI.Extensions.DependencyInjection.csproj
index 88c13b8..3f6431c 100644
--- a/source/UpbeatUI.Extensions.DependencyInjection/UpbeatUI.Extensions.DependencyInjection.csproj
+++ b/source/UpbeatUI.Extensions.DependencyInjection/UpbeatUI.Extensions.DependencyInjection.csproj
@@ -22,7 +22,7 @@
         <Copyright>© Michael P. Duda 2020-2024</Copyright>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <!-- Update the following properties when publishing a new Nuget version -->
-        <Version>2.2.0-rc1</Version>
+        <Version>2.2.0-rc2</Version>
         <PackageValidationBaselineVersion>2.1.0</PackageValidationBaselineVersion>
     </PropertyGroup>
 
diff --git a/source/UpbeatUI.Extensions.Hosting/UpbeatUI.Extensions.Hosting.csproj b/source/UpbeatUI.Extensions.Hosting/UpbeatUI.Extensions.Hosting.csproj
index 67bee0a..0e828d3 100644
--- a/source/UpbeatUI.Extensions.Hosting/UpbeatUI.Extensions.Hosting.csproj
+++ b/source/UpbeatUI.Extensions.Hosting/UpbeatUI.Extensions.Hosting.csproj
@@ -22,7 +22,7 @@
         <Copyright>© Michael P. Duda 2020-2024</Copyright>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <!-- Update the following properties when publishing a new Nuget version -->
-        <Version>4.2.0-rc1</Version>
+        <Version>4.2.0-rc2</Version>
         <PackageValidationBaselineVersion>4.1.0</PackageValidationBaselineVersion>
     </PropertyGroup>
 
diff --git a/source/UpbeatUI/UpbeatUI.csproj b/source/UpbeatUI/UpbeatUI.csproj
index 83fa869..bf4fc67 100644
--- a/source/UpbeatUI/UpbeatUI.csproj
+++ b/source/UpbeatUI/UpbeatUI.csproj
@@ -23,7 +23,7 @@
         <Copyright>© Michael P. Duda 2020-2024</Copyright>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <!-- Update the following properties when publishing a new Nuget version -->
-        <Version>5.2.0-rc1</Version>
+        <Version>5.2.0-rc2</Version>
         <PackageValidationBaselineVersion>5.1.0</PackageValidationBaselineVersion>
     </PropertyGroup>