From 71859842012b76fee17768443a230206d6fa4c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaro=20Mart=C3=ADnez?= <xoas@airmail.cc>
Date: Mon, 30 Dec 2024 23:05:31 -0500
Subject: [PATCH 01/13] Add clock click action settings

---
 RetroBar/Controls/Clock.xaml.cs           |  43 +++----
 RetroBar/Languages/English.xaml           |   7 ++
 RetroBar/PropertiesWindow.xaml            |  10 ++
 RetroBar/PropertiesWindow.xaml.cs         |  32 +++++
 RetroBar/Utilities/ClockFlyoutLauncher.cs | 147 ++++++++++++++++++++++
 RetroBar/Utilities/Settings.cs            |  15 +++
 6 files changed, 230 insertions(+), 24 deletions(-)
 create mode 100644 RetroBar/Utilities/ClockFlyoutLauncher.cs

diff --git a/RetroBar/Controls/Clock.xaml.cs b/RetroBar/Controls/Clock.xaml.cs
index 2f969bb0..2caf09cc 100644
--- a/RetroBar/Controls/Clock.xaml.cs
+++ b/RetroBar/Controls/Clock.xaml.cs
@@ -27,7 +27,6 @@ public DateTime Now
         }
 
         private readonly DispatcherTimer clock = new DispatcherTimer(DispatcherPriority.Background);
-        private readonly DispatcherTimer singleClick = new DispatcherTimer(DispatcherPriority.Input);
 
         private bool _isLoaded;
 
@@ -38,9 +37,6 @@ public Clock()
 
             clock.Interval = TimeSpan.FromMilliseconds(200);
             clock.Tick += Clock_Tick;
-
-            singleClick.Interval = TimeSpan.FromMilliseconds(System.Windows.Forms.SystemInformation.DoubleClickTime);
-            singleClick.Tick += SingleClick_Tick;
         }
 
         private void Initialize()
@@ -65,7 +61,7 @@ private void StartClock()
             SetTime();
 
             clock.Start();
-            
+
             Visibility = Visibility.Visible;
         }
 
@@ -96,22 +92,6 @@ private void Clock_Tick(object sender, EventArgs args)
             SetTime();
         }
 
-        private void SingleClick_Tick(object sender, EventArgs args)
-        {
-            // Windows 10-11 single-click action
-            // A double-click will cancel the timer so that this doesn't run
-
-            singleClick.Stop();
-            if (EnvironmentHelper.IsWindows11OrBetter)
-            {
-                ShellHelper.ShowNotificationCenter();
-            }
-            else
-            {
-                ShellHelper.ShowActionCenter();
-            }
-        }
-
         private void TimeChanged(object sender, EventArgs e)
         {
             TimeZoneInfo.ClearCachedData();
@@ -181,15 +161,30 @@ private void SetTime()
 
         private void Clock_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
-            if (EnvironmentHelper.IsWindows10OrBetter)
+            switch (Settings.Instance.ClockClickAction)
             {
-                singleClick.Start();
+                case ClockClickOption.OpenModernCalendar:
+                    ClockFlyoutLauncher.ShowClockFlyout();
+                    break;
+                case ClockClickOption.OpenAeroClockFlyout:
+                    IntPtr hWnd = (PresentationSource.FromVisual(this) as System.Windows.Interop.HwndSource).Handle;
+                    ClockFlyoutLauncher.ShowAeroClockFlyout(hWnd);
+                    break;
+                case ClockClickOption.OpenActionCenter:
+                    if (EnvironmentHelper.IsWindows11OrBetter)
+                    {
+                        ShellHelper.ShowNotificationCenter();
+                    }
+                    else if (EnvironmentHelper.IsWindows10OrBetter)
+                    {
+                        ShellHelper.ShowActionCenter();
+                    }
+                    break;
             }
         }
 
         private void Clock_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
-            singleClick.Stop();
             ShellHelper.StartProcess("timedate.cpl");
 
             e.Handled = true;
diff --git a/RetroBar/Languages/English.xaml b/RetroBar/Languages/English.xaml
index b7f832b9..c86aff48 100644
--- a/RetroBar/Languages/English.xaml
+++ b/RetroBar/Languages/English.xaml
@@ -57,6 +57,13 @@
         <s:String>Open a new instance</s:String>
         <s:String>Close the task</s:String>
     </x:Array>
+    <s:String x:Key="clock_click_action">_Clock click action:</s:String>
+    <x:Array x:Key="clock_click_action_values" Type="s:String">
+        <s:String>Do nothing</s:String>
+        <s:String>Open Aero clock flyout</s:String>
+        <s:String>Open Action Center/Notification Center</s:String>
+        <s:String>Open Modern calendar</s:String>
+    </x:Array>
     <s:String x:Key="version">Version {0}</s:String>
     <s:String x:Key="visit_on_github">Visit RetroBar on GitHub</s:String>
     <s:String x:Key="taskbar_scale">Taskbar scale</s:String>
diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
index 3644078d..b3a3b3da 100644
--- a/RetroBar/PropertiesWindow.xaml
+++ b/RetroBar/PropertiesWindow.xaml
@@ -362,6 +362,16 @@
                                       SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=TaskMiddleClickAction, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource enumConverter}}"
                                       SelectionChanged="cboMiddleMouseAction_SelectionChanged" />
                         </DockPanel>
+                        <DockPanel>
+                            <Label VerticalAlignment="Center"
+                                   Target="{Binding ElementName=cboClockAction}">
+                                <AccessText Text="{DynamicResource clock_click_action}" />
+                            </Label>
+                            <ComboBox x:Name="cboClockAction"
+                                      ItemsSource="{DynamicResource clock_click_action_values}"
+                                      SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=ClockClickAction, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource enumConverter}}"
+                                      SelectionChanged="cboClockAction_SelectionChanged" />
+                        </DockPanel>
                         <DockPanel>
                             <Label VerticalAlignment="Center"
                                    Target="{Binding ElementName=cboInvertIconsMode}">
diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
index f4afb321..a346dbb4 100644
--- a/RetroBar/PropertiesWindow.xaml.cs
+++ b/RetroBar/PropertiesWindow.xaml.cs
@@ -277,6 +277,30 @@ private void AutoStartCheckBox_OnChecked(object sender, RoutedEventArgs e)
         private void cboLanguageSelect_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
         {
             LoadVersion();
+
+            if (!EnvironmentHelper.IsWindows10OrBetter)
+            {
+                PopulateClockActionsForPreWindows10();
+            }
+        }
+
+        private void PopulateClockActionsForPreWindows10()
+        {
+            var availableClockActions = (FindResource("clock_click_action_values") as Array)?.Cast<object>().ToList();
+            if (availableClockActions == null)
+            {
+                return;
+            }
+
+            if (Settings.Instance.ClockClickAction > ClockClickOption.OpenAeroClockFlyout)
+            {
+                // ClockClickAction is out of range; reverting to default
+                cboClockAction.SelectedValue = availableClockActions[(int)ClockClickOption.OpenAeroClockFlyout];
+            }
+
+            availableClockActions.RemoveAt(availableClockActions.Count - 1);
+            availableClockActions.RemoveAt(availableClockActions.Count - 1);
+            cboClockAction.ItemsSource = availableClockActions;
         }
 
         private void cboEdgeSelect_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
@@ -311,6 +335,14 @@ private void cboMiddleMouseAction_SelectionChanged(object sender, System.Windows
             }
         }
 
+        private void cboClockAction_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+        {
+            if (cboClockAction.SelectedItem == null)
+            {
+                cboClockAction.SelectedValue = cboClockAction.Items[(int)Settings.Instance.ClockClickAction];
+            }
+        }
+
         private void cboRowCount_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
         {
             if (cboRowCount.SelectedItem == null)
diff --git a/RetroBar/Utilities/ClockFlyoutLauncher.cs b/RetroBar/Utilities/ClockFlyoutLauncher.cs
new file mode 100644
index 00000000..1feefc82
--- /dev/null
+++ b/RetroBar/Utilities/ClockFlyoutLauncher.cs
@@ -0,0 +1,147 @@
+using ManagedShell.AppBar;
+using ManagedShell.Common.Helpers;
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows;
+using static ManagedShell.Interop.NativeMethods;
+using Rect = ManagedShell.Interop.NativeMethods.Rect;
+using Screen = System.Windows.Forms.Screen;
+
+namespace RetroBar.Utilities
+{
+    internal class ClockFlyoutLauncher
+    {
+        private const SetWindowPosFlags NoPosFlags = SetWindowPosFlags.SWP_NOSIZE | SetWindowPosFlags.SWP_NOACTIVATE | SetWindowPosFlags.SWP_NOZORDER;
+
+        #region Aero clock
+
+        private static readonly Lazy<Type> AeroClockType = new(() => Type.GetTypeFromCLSID(new("A323554A-0FE1-4E49-AEE1-6722465D799F")));
+        private static object _aeroClockInstance;
+
+        [ComImport, Guid("7A5FCA8A-76B1-44C8-A97C-E7173CCA5F4F"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        private interface IAeroClock // For 8+
+        {
+            [PreserveSig]
+            void ShowFlyout(IntPtr hWnd, ref Rect lpRect);
+        }
+
+        [ComImport, Guid("4376DF10-A662-420B-B30D-958881461EF9"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        private interface IAeroClockLegacy // For Vista and 7
+        {
+            [PreserveSig]
+            void ShowFlyout(int unk, ref Rect lpRect);
+        }
+
+        internal static void ShowAeroClockFlyout(IntPtr taskbarHwnd)
+        {
+            Screen taskbarScreen = Screen.FromHandle(taskbarHwnd);
+            if (!GetWindowRect(taskbarHwnd, out Rect lpRect))
+            {
+                return;
+            }
+
+            _aeroClockInstance ??= Activator.CreateInstance(AeroClockType.Value);
+
+            if (ManagedShell.Common.Helpers.EnvironmentHelper.IsWindows8OrBetter)
+            {
+                ((IAeroClock)_aeroClockInstance).ShowFlyout(taskbarHwnd, ref lpRect);
+            }
+            else
+            {
+                ((IAeroClockLegacy)_aeroClockInstance).ShowFlyout(0, ref lpRect);
+            }
+
+            FixAeroClockFlyoutPosition(taskbarScreen);
+        }
+
+        private static void FixAeroClockFlyoutPosition(Screen taskbarScreen)
+        {
+            IntPtr clockFlyoutHwnd = FindWindow("ClockFlyoutWindow", null);
+            if (clockFlyoutHwnd == IntPtr.Zero)
+            {
+                return;
+            }
+
+            GetWindowRect(clockFlyoutHwnd, out Rect clockFlyoutRect);
+
+            // Keep the flyout at least 3 by 3 pixels inside the working area
+            int newX = (int)Math.Max(taskbarScreen.WorkingArea.Left + 3, Math.Min(taskbarScreen.WorkingArea.Right - (clockFlyoutRect.Width) - 3, clockFlyoutRect.Left));
+            int newY = (int)Math.Max(taskbarScreen.WorkingArea.Top + 3, Math.Min(taskbarScreen.WorkingArea.Bottom - (clockFlyoutRect.Height) - 3, clockFlyoutRect.Top));
+            SetWindowPos(clockFlyoutHwnd, IntPtr.Zero, newX, newY, 0, 0, (int)(NoPosFlags));
+        }
+
+        #endregion Aero clock
+
+        #region Modern clock
+
+        internal static void ShowClockFlyout()
+        {
+            // Current implementation is for the primary screen only
+            Screen screen = Screen.PrimaryScreen;
+            FlowDirection flowDirection = Application.Current.FindResource("flow_direction") as FlowDirection? ?? FlowDirection.LeftToRight;
+
+            PostMessage(WindowHelper.FindWindowsTray(WindowHelper.FindWindowsTray(IntPtr.Zero)), (uint)0x5CE, IntPtr.Zero, IntPtr.Zero);
+
+            // Launching the Modern clock is slower than the Aero clock, so we need to wait for the window to be created...
+            System.Windows.Threading.DispatcherTimer timer = new()
+            {
+                Interval = TimeSpan.FromTicks(10)
+            };
+
+            int attempts = 0;
+            StringBuilder className = new(256);
+
+            timer.Tick += (_, _) =>
+            {
+                if (++attempts > 100)
+                {
+                    timer.Stop();
+                    return;
+                }
+
+                IntPtr hwnd = GetForegroundWindow();
+                if (hwnd == IntPtr.Zero)
+                {
+                    return;
+                }
+
+                className.Clear();
+                _ = GetClassName(hwnd, className, className.Capacity);
+                if (className.ToString() != "Windows.UI.Core.CoreWindow")
+                {
+                    return;
+                }
+
+                ShowWindow(hwnd, (int)WindowShowStyle.Hide);
+
+                if (!GetWindowRect(hwnd, out Rect rect) || rect.Width <= 1)
+                {
+                    return;
+                }
+
+                timer.Stop();
+
+                // Move to corner where the taskbar is
+                int newX = Settings.Instance.Edge switch
+                {
+                    AppBarEdge.Left => screen.WorkingArea.Left,
+                    AppBarEdge.Right => screen.WorkingArea.Right - rect.Width,
+                    _ => (flowDirection == FlowDirection.LeftToRight) ? screen.WorkingArea.Right - rect.Width : screen.WorkingArea.Left
+                };
+
+                int newY = Settings.Instance.Edge switch
+                {
+                    AppBarEdge.Top => screen.WorkingArea.Top,
+                    _ => screen.WorkingArea.Bottom - rect.Height
+                };
+
+                SetWindowPos(hwnd, IntPtr.Zero, newX, newY, 0, 0, (int)(NoPosFlags | SetWindowPosFlags.SWP_SHOWWINDOW));
+            };
+
+            timer.Start();
+        }
+    }
+
+    #endregion Modern clock
+}
\ No newline at end of file
diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
index 1e165d28..29aa672c 100644
--- a/RetroBar/Utilities/Settings.cs
+++ b/RetroBar/Utilities/Settings.cs
@@ -304,6 +304,13 @@ public TaskMiddleClickOption TaskMiddleClickAction
             set => SetEnum(ref _taskMiddleClickAction, value);
         }
 
+        private ClockClickOption _clockClickAction = EnvironmentHelper.IsWindows10OrBetter ? ClockClickOption.OpenActionCenter : ClockClickOption.OpenAeroClockFlyout;
+        public ClockClickOption ClockClickAction
+        {
+            get => _clockClickAction;
+            set => SetEnum(ref _clockClickAction, value);
+        }
+
         private bool _checkForUpdates = true;
         public bool CheckForUpdates
         {
@@ -376,6 +383,14 @@ public enum TaskMiddleClickOption
         CloseTask
     }
 
+    public enum ClockClickOption
+    {
+        DoNothing,
+        OpenAeroClockFlyout,
+        OpenActionCenter,
+        OpenModernCalendar,
+    }
+
     public enum NotifyIconBehavior
     {
         HideWhenInactive,

From d72e613105df394809404b0fb5143e6280ec7181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaro=20Mart=C3=ADnez?= <xoas@airmail.cc>
Date: Tue, 31 Dec 2024 00:48:30 -0500
Subject: [PATCH 02/13] Change default ClockClickAction to DoNothing for
 pre-Windows 10 environments

---
 RetroBar/PropertiesWindow.xaml.cs | 2 +-
 RetroBar/Utilities/Settings.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
index a346dbb4..64b1374f 100644
--- a/RetroBar/PropertiesWindow.xaml.cs
+++ b/RetroBar/PropertiesWindow.xaml.cs
@@ -295,7 +295,7 @@ private void PopulateClockActionsForPreWindows10()
             if (Settings.Instance.ClockClickAction > ClockClickOption.OpenAeroClockFlyout)
             {
                 // ClockClickAction is out of range; reverting to default
-                cboClockAction.SelectedValue = availableClockActions[(int)ClockClickOption.OpenAeroClockFlyout];
+                cboClockAction.SelectedValue = availableClockActions[(int)ClockClickOption.DoNothing];
             }
 
             availableClockActions.RemoveAt(availableClockActions.Count - 1);
diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
index 29aa672c..be5fa191 100644
--- a/RetroBar/Utilities/Settings.cs
+++ b/RetroBar/Utilities/Settings.cs
@@ -304,7 +304,7 @@ public TaskMiddleClickOption TaskMiddleClickAction
             set => SetEnum(ref _taskMiddleClickAction, value);
         }
 
-        private ClockClickOption _clockClickAction = EnvironmentHelper.IsWindows10OrBetter ? ClockClickOption.OpenActionCenter : ClockClickOption.OpenAeroClockFlyout;
+        private ClockClickOption _clockClickAction = EnvironmentHelper.IsWindows10OrBetter ? ClockClickOption.OpenActionCenter : ClockClickOption.DoNothing;
         public ClockClickOption ClockClickAction
         {
             get => _clockClickAction;

From faca92168f0d30ed2521c524f436463c7a29ad66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaro=20Mart=C3=ADnez?= <xoas@airmail.cc>
Date: Tue, 31 Dec 2024 01:40:08 -0500
Subject: [PATCH 03/13] Apply suggested changes

---
 RetroBar/Controls/Clock.xaml.cs           |  4 ++--
 RetroBar/Languages/English.xaml           |  4 ++--
 RetroBar/PropertiesWindow.xaml.cs         | 17 +++++++++--------
 RetroBar/Utilities/ClockFlyoutLauncher.cs |  2 +-
 RetroBar/Utilities/Settings.cs            |  6 +++---
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/RetroBar/Controls/Clock.xaml.cs b/RetroBar/Controls/Clock.xaml.cs
index 2caf09cc..48f42c5c 100644
--- a/RetroBar/Controls/Clock.xaml.cs
+++ b/RetroBar/Controls/Clock.xaml.cs
@@ -166,11 +166,11 @@ private void Clock_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
                 case ClockClickOption.OpenModernCalendar:
                     ClockFlyoutLauncher.ShowClockFlyout();
                     break;
-                case ClockClickOption.OpenAeroClockFlyout:
+                case ClockClickOption.OpenAeroCalendar:
                     IntPtr hWnd = (PresentationSource.FromVisual(this) as System.Windows.Interop.HwndSource).Handle;
                     ClockFlyoutLauncher.ShowAeroClockFlyout(hWnd);
                     break;
-                case ClockClickOption.OpenActionCenter:
+                case ClockClickOption.OpenNotificationCenter:
                     if (EnvironmentHelper.IsWindows11OrBetter)
                     {
                         ShellHelper.ShowNotificationCenter();
diff --git a/RetroBar/Languages/English.xaml b/RetroBar/Languages/English.xaml
index c86aff48..541c814c 100644
--- a/RetroBar/Languages/English.xaml
+++ b/RetroBar/Languages/English.xaml
@@ -60,9 +60,9 @@
     <s:String x:Key="clock_click_action">_Clock click action:</s:String>
     <x:Array x:Key="clock_click_action_values" Type="s:String">
         <s:String>Do nothing</s:String>
-        <s:String>Open Aero clock flyout</s:String>
-        <s:String>Open Action Center/Notification Center</s:String>
+        <s:String>Open Aero calendar</s:String>
         <s:String>Open Modern calendar</s:String>
+        <s:String>Open Notification Center</s:String>
     </x:Array>
     <s:String x:Key="version">Version {0}</s:String>
     <s:String x:Key="visit_on_github">Visit RetroBar on GitHub</s:String>
diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
index 64b1374f..60422c10 100644
--- a/RetroBar/PropertiesWindow.xaml.cs
+++ b/RetroBar/PropertiesWindow.xaml.cs
@@ -277,29 +277,30 @@ private void AutoStartCheckBox_OnChecked(object sender, RoutedEventArgs e)
         private void cboLanguageSelect_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
         {
             LoadVersion();
-
-            if (!EnvironmentHelper.IsWindows10OrBetter)
-            {
-                PopulateClockActionsForPreWindows10();
-            }
+            PopulateClockActionsForPreWindows10();
         }
 
         private void PopulateClockActionsForPreWindows10()
         {
+            if (EnvironmentHelper.IsWindows10OrBetter)
+            {
+                return;
+            }
+
             var availableClockActions = (FindResource("clock_click_action_values") as Array)?.Cast<object>().ToList();
             if (availableClockActions == null)
             {
                 return;
             }
 
-            if (Settings.Instance.ClockClickAction > ClockClickOption.OpenAeroClockFlyout)
+            if (Settings.Instance.ClockClickAction > ClockClickOption.OpenAeroCalendar)
             {
                 // ClockClickAction is out of range; reverting to default
                 cboClockAction.SelectedValue = availableClockActions[(int)ClockClickOption.DoNothing];
             }
 
-            availableClockActions.RemoveAt(availableClockActions.Count - 1);
-            availableClockActions.RemoveAt(availableClockActions.Count - 1);
+            availableClockActions.RemoveAt((int)ClockClickOption.OpenNotificationCenter);
+            availableClockActions.RemoveAt((int)ClockClickOption.OpenModernCalendar);
             cboClockAction.ItemsSource = availableClockActions;
         }
 
diff --git a/RetroBar/Utilities/ClockFlyoutLauncher.cs b/RetroBar/Utilities/ClockFlyoutLauncher.cs
index 1feefc82..68536707 100644
--- a/RetroBar/Utilities/ClockFlyoutLauncher.cs
+++ b/RetroBar/Utilities/ClockFlyoutLauncher.cs
@@ -43,7 +43,7 @@ internal static void ShowAeroClockFlyout(IntPtr taskbarHwnd)
 
             _aeroClockInstance ??= Activator.CreateInstance(AeroClockType.Value);
 
-            if (ManagedShell.Common.Helpers.EnvironmentHelper.IsWindows8OrBetter)
+            if (EnvironmentHelper.IsWindows8OrBetter)
             {
                 ((IAeroClock)_aeroClockInstance).ShowFlyout(taskbarHwnd, ref lpRect);
             }
diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
index be5fa191..2e873c1f 100644
--- a/RetroBar/Utilities/Settings.cs
+++ b/RetroBar/Utilities/Settings.cs
@@ -304,7 +304,7 @@ public TaskMiddleClickOption TaskMiddleClickAction
             set => SetEnum(ref _taskMiddleClickAction, value);
         }
 
-        private ClockClickOption _clockClickAction = EnvironmentHelper.IsWindows10OrBetter ? ClockClickOption.OpenActionCenter : ClockClickOption.DoNothing;
+        private ClockClickOption _clockClickAction = EnvironmentHelper.IsWindows10OrBetter ? ClockClickOption.OpenNotificationCenter : ClockClickOption.DoNothing;
         public ClockClickOption ClockClickAction
         {
             get => _clockClickAction;
@@ -386,9 +386,9 @@ public enum TaskMiddleClickOption
     public enum ClockClickOption
     {
         DoNothing,
-        OpenAeroClockFlyout,
-        OpenActionCenter,
+        OpenAeroCalendar,
         OpenModernCalendar,
+        OpenNotificationCenter,
     }
 
     public enum NotifyIconBehavior

From cfa98482e31797f43ade6c9d0a9c48937430b052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaro=20Mart=C3=ADnez?= <xoas@airmail.cc>
Date: Tue, 31 Dec 2024 10:17:26 -0500
Subject: [PATCH 04/13] Change Aero calendar spacing to 15 pixels

---
 RetroBar/Utilities/ClockFlyoutLauncher.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/RetroBar/Utilities/ClockFlyoutLauncher.cs b/RetroBar/Utilities/ClockFlyoutLauncher.cs
index 68536707..6708eca2 100644
--- a/RetroBar/Utilities/ClockFlyoutLauncher.cs
+++ b/RetroBar/Utilities/ClockFlyoutLauncher.cs
@@ -65,9 +65,9 @@ private static void FixAeroClockFlyoutPosition(Screen taskbarScreen)
 
             GetWindowRect(clockFlyoutHwnd, out Rect clockFlyoutRect);
 
-            // Keep the flyout at least 3 by 3 pixels inside the working area
-            int newX = (int)Math.Max(taskbarScreen.WorkingArea.Left + 3, Math.Min(taskbarScreen.WorkingArea.Right - (clockFlyoutRect.Width) - 3, clockFlyoutRect.Left));
-            int newY = (int)Math.Max(taskbarScreen.WorkingArea.Top + 3, Math.Min(taskbarScreen.WorkingArea.Bottom - (clockFlyoutRect.Height) - 3, clockFlyoutRect.Top));
+            // Keep the flyout at least 15 by 15 pixels inside the working area
+            int newX = (int)Math.Max(taskbarScreen.WorkingArea.Left + 15, Math.Min(taskbarScreen.WorkingArea.Right - (clockFlyoutRect.Width) - 15, clockFlyoutRect.Left));
+            int newY = (int)Math.Max(taskbarScreen.WorkingArea.Top + 15, Math.Min(taskbarScreen.WorkingArea.Bottom - (clockFlyoutRect.Height) - 15, clockFlyoutRect.Top));
             SetWindowPos(clockFlyoutHwnd, IntPtr.Zero, newX, newY, 0, 0, (int)(NoPosFlags));
         }
 

From 2d58be78514ddb354dfcdd7c01a3a6b91c59a571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaro=20Mart=C3=ADnez?= <xoas@airmail.cc>
Date: Tue, 31 Dec 2024 10:18:31 -0500
Subject: [PATCH 05/13] Update Spanish translation

---
 "RetroBar/Languages/espa\303\261ol.xaml" | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git "a/RetroBar/Languages/espa\303\261ol.xaml" "b/RetroBar/Languages/espa\303\261ol.xaml"
index 4da012ad..40061d3b 100644
--- "a/RetroBar/Languages/espa\303\261ol.xaml"
+++ "b/RetroBar/Languages/espa\303\261ol.xaml"
@@ -57,6 +57,13 @@
         <s:String>Abrir una nueva instancia</s:String>
         <s:String>Cerrar la tarea</s:String>
     </x:Array>
+    <s:String x:Key="clock_click_action">_Acción al hacer clic en el reloj:</s:String>
+    <x:Array x:Key="clock_click_action_values" Type="s:String">
+        <s:String>No hacer nada</s:String>
+        <s:String>Abrir el calendario Aero</s:String>
+        <s:String>Abrir el calendario Moderno</s:String>
+        <s:String>Abrir el Centro de notificaciones</s:String>
+    </x:Array>
     <s:String x:Key="version">Versión {0}</s:String>
     <s:String x:Key="visit_on_github">Visitar RetroBar en GitHub</s:String>
     <s:String x:Key="taskbar_scale">Escala de barra de tareas</s:String>

From 660be69ba21537bb39dc377c8cb438df282eb758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaro=20Mart=C3=ADnez?= <xoas@airmail.cc>
Date: Tue, 31 Dec 2024 10:24:25 -0500
Subject: [PATCH 06/13] Update English (United Kingdom) translation

---
 RetroBar/Languages/English (United Kingdom).xaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/RetroBar/Languages/English (United Kingdom).xaml b/RetroBar/Languages/English (United Kingdom).xaml
index ae4de2dd..a02d1e13 100644
--- a/RetroBar/Languages/English (United Kingdom).xaml	
+++ b/RetroBar/Languages/English (United Kingdom).xaml	
@@ -3,6 +3,13 @@
                     xmlns:s="clr-namespace:System;assembly=mscorlib">
 
     <s:String x:Key="customize">_Customise...</s:String>
+    <x:Array x:Key="clock_click_action_values" Type="s:String">
+        <s:String>Do nothing</s:String>
+        <s:String>Open Aero calendar</s:String>
+        <s:String>Open Modern calendar</s:String>
+        <s:String>Open Notification Centre</s:String>
+    </x:Array>
+
     <s:String x:Key="customize_notifications">Customise Notifications</s:String>
     <s:String x:Key="customize_notifications_info">RetroBar displays icons for active and urgent notifications, and hides inactive ones. You can change this behaviour for items in the list below.</s:String>
     <s:String x:Key="customize_notifications_instruction">Select an item, then choose its notification behaviour:</s:String>

From 065134e08edd727374f041358293b518783ccc1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaro=20Mart=C3=ADnez?= <xoas@airmail.cc>
Date: Tue, 31 Dec 2024 13:47:09 -0500
Subject: [PATCH 07/13] Remove LoadVersion() from PropertiesWindow constructor

---
 RetroBar/PropertiesWindow.xaml.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
index 60422c10..7f2a26a5 100644
--- a/RetroBar/PropertiesWindow.xaml.cs
+++ b/RetroBar/PropertiesWindow.xaml.cs
@@ -80,7 +80,6 @@ private PropertiesWindow(NotificationArea notificationArea, DictionaryManager di
             LoadLanguages();
             LoadRows();
             LoadThemes();
-            LoadVersion();
             LoadWidth();
 
             Settings.Instance.PropertyChanged += Settings_PropertyChanged;

From 2bc89bf4617f4d00150555c723ad76186f9c71ad Mon Sep 17 00:00:00 2001
From: Sam Johnson <sam@scj.me>
Date: Tue, 31 Dec 2024 18:29:54 -0600
Subject: [PATCH 08/13] Improve properties loading

---
 RetroBar/PropertiesWindow.xaml    |  3 +--
 RetroBar/PropertiesWindow.xaml.cs | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
index b3a3b3da..886fc8ea 100644
--- a/RetroBar/PropertiesWindow.xaml
+++ b/RetroBar/PropertiesWindow.xaml
@@ -182,8 +182,7 @@
                                                 ToolTip="{DynamicResource language_tip}" />
                                 </Label>
                                 <ComboBox Name="cboLanguageSelect"
-                                          SelectedValue="{Binding Source={x:Static Settings:Settings.Instance}, Path=Language, UpdateSourceTrigger=PropertyChanged}"
-                                          SelectionChanged="cboLanguageSelect_SelectionChanged" />
+                                          SelectedValue="{Binding Source={x:Static Settings:Settings.Instance}, Path=Language, UpdateSourceTrigger=PropertyChanged}" />
                             </DockPanel>
                             <DockPanel>
                                 <Label VerticalAlignment="Center"
diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
index 7f2a26a5..61c08315 100644
--- a/RetroBar/PropertiesWindow.xaml.cs
+++ b/RetroBar/PropertiesWindow.xaml.cs
@@ -81,6 +81,8 @@ private PropertiesWindow(NotificationArea notificationArea, DictionaryManager di
             LoadRows();
             LoadThemes();
             LoadWidth();
+            LoadVersion();
+            LoadClockActions();
 
             Settings.Instance.PropertyChanged += Settings_PropertyChanged;
         }
@@ -96,6 +98,11 @@ private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
             {
                 LoadPreviewHeight();
             }
+            else if (e.PropertyName == nameof(Settings.Language))
+            {
+                LoadVersion();
+                LoadClockActions();
+            }
         }
 
         public static PropertiesWindow Open(NotificationArea notificationArea, DictionaryManager dictionaryManager, AppBarScreen screen, double dpiScale, double barSize)
@@ -273,19 +280,14 @@ private void AutoStartCheckBox_OnChecked(object sender, RoutedEventArgs e)
             }
         }
 
-        private void cboLanguageSelect_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
-        {
-            LoadVersion();
-            PopulateClockActionsForPreWindows10();
-        }
-
-        private void PopulateClockActionsForPreWindows10()
+        private void LoadClockActions()
         {
             if (EnvironmentHelper.IsWindows10OrBetter)
             {
-                return;
+               return;
             }
 
+            // Remove options unsupported prior to Windows 10.
             var availableClockActions = (FindResource("clock_click_action_values") as Array)?.Cast<object>().ToList();
             if (availableClockActions == null)
             {

From 6bdc12f45cccd8b8c2a1fcfdae6e2138a5c80ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaro=20Mart=C3=ADnez?= <xoas@airmail.cc>
Date: Tue, 31 Dec 2024 23:25:02 -0500
Subject: [PATCH 09/13] Normalize Aero clock flyout position and margin to
 Vista style

---
 RetroBar/PropertiesWindow.xaml.cs         |  2 +-
 RetroBar/Utilities/ClockFlyoutLauncher.cs | 41 ++++++++++++++++++++---
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
index 61c08315..2331b3cc 100644
--- a/RetroBar/PropertiesWindow.xaml.cs
+++ b/RetroBar/PropertiesWindow.xaml.cs
@@ -284,7 +284,7 @@ private void LoadClockActions()
         {
             if (EnvironmentHelper.IsWindows10OrBetter)
             {
-               return;
+                return;
             }
 
             // Remove options unsupported prior to Windows 10.
diff --git a/RetroBar/Utilities/ClockFlyoutLauncher.cs b/RetroBar/Utilities/ClockFlyoutLauncher.cs
index 6708eca2..3d416cc0 100644
--- a/RetroBar/Utilities/ClockFlyoutLauncher.cs
+++ b/RetroBar/Utilities/ClockFlyoutLauncher.cs
@@ -63,12 +63,43 @@ private static void FixAeroClockFlyoutPosition(Screen taskbarScreen)
                 return;
             }
 
-            GetWindowRect(clockFlyoutHwnd, out Rect clockFlyoutRect);
+            if (!GetWindowRect(clockFlyoutHwnd, out Rect rect))
+            {
+                return;
+            }
+
+            var wa = taskbarScreen.WorkingArea;
+            int newX = rect.Left, newY = rect.Top;
+
+            // Max margin (as used in Windows 7)
+            int snap = 15;
+            // Vista margin
+            int margin = 7;
+
+            // Move to closest edge if the flyout is too close to the screen edge
+            if (Math.Abs(newX - wa.Left) <= snap) // Left
+            {
+                newX = wa.Left + margin;
+            }
+            else if (Math.Abs(rect.Right - wa.Right) <= snap) // Right
+            {
+                newX = wa.Right - rect.Width - margin;
+            }
+
+            if (Math.Abs(newY - wa.Top) <= snap) // Top
+            {
+                newY = wa.Top + margin;
+            }
+            else if (Math.Abs(rect.Bottom - wa.Bottom) <= snap) // Bottom
+            {
+                newY = wa.Bottom - rect.Height - margin;
+            }
+
+            // Keep the flyout inside the working area
+            newX = Math.Max(wa.Left + margin, Math.Min(newX, wa.Right - rect.Width - margin));
+            newY = Math.Max(wa.Top + margin, Math.Min(newY, wa.Bottom - rect.Height - margin));
 
-            // Keep the flyout at least 15 by 15 pixels inside the working area
-            int newX = (int)Math.Max(taskbarScreen.WorkingArea.Left + 15, Math.Min(taskbarScreen.WorkingArea.Right - (clockFlyoutRect.Width) - 15, clockFlyoutRect.Left));
-            int newY = (int)Math.Max(taskbarScreen.WorkingArea.Top + 15, Math.Min(taskbarScreen.WorkingArea.Bottom - (clockFlyoutRect.Height) - 15, clockFlyoutRect.Top));
-            SetWindowPos(clockFlyoutHwnd, IntPtr.Zero, newX, newY, 0, 0, (int)(NoPosFlags));
+            SetWindowPos(clockFlyoutHwnd, IntPtr.Zero, newX, newY, 0, 0, (int)NoPosFlags);
         }
 
         #endregion Aero clock

From 58e27c37ba57fee9d17485ba3e02d7a5a0efa1b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaro=20Mart=C3=ADnez?= <xoas@airmail.cc>
Date: Sat, 4 Jan 2025 14:43:39 -0500
Subject: [PATCH 10/13] Remove Modern calendar flyout option for Windows 11

Override settings without overwriting them, allowing the user to keep his or her settings while the behavior matches that of the system.
---
 RetroBar/PropertiesWindow.xaml.cs | 11 ++++-------
 RetroBar/Utilities/Settings.cs    | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
index bd740dd8..67822603 100644
--- a/RetroBar/PropertiesWindow.xaml.cs
+++ b/RetroBar/PropertiesWindow.xaml.cs
@@ -291,25 +291,22 @@ private void AutoStartCheckBox_OnChecked(object sender, RoutedEventArgs e)
 
         private void LoadClockActions()
         {
-            if (EnvironmentHelper.IsWindows10OrBetter)
+            if (EnvironmentHelper.IsWindows10OrBetter && !EnvironmentHelper.IsWindows11OrBetter)
             {
                 return;
             }
 
-            // Remove options unsupported prior to Windows 10.
+            // Remove options unsupported prior to Windows 10 or not available for Windows 11.
             var availableClockActions = (FindResource("clock_click_action_values") as Array)?.Cast<object>().ToList();
             if (availableClockActions == null)
             {
                 return;
             }
 
-            if (Settings.Instance.ClockClickAction > ClockClickOption.OpenAeroCalendar)
+            if (!EnvironmentHelper.IsWindows10OrBetter)
             {
-                // ClockClickAction is out of range; reverting to default
-                cboClockAction.SelectedValue = availableClockActions[(int)ClockClickOption.DoNothing];
+                availableClockActions.RemoveAt((int)ClockClickOption.OpenNotificationCenter);
             }
-
-            availableClockActions.RemoveAt((int)ClockClickOption.OpenNotificationCenter);
             availableClockActions.RemoveAt((int)ClockClickOption.OpenModernCalendar);
             cboClockAction.ItemsSource = availableClockActions;
         }
diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
index 04223e59..531913fa 100644
--- a/RetroBar/Utilities/Settings.cs
+++ b/RetroBar/Utilities/Settings.cs
@@ -307,7 +307,21 @@ public TaskMiddleClickOption TaskMiddleClickAction
         private ClockClickOption _clockClickAction = EnvironmentHelper.IsWindows10OrBetter ? ClockClickOption.OpenNotificationCenter : ClockClickOption.DoNothing;
         public ClockClickOption ClockClickAction
         {
-            get => _clockClickAction;
+            get
+            {
+                // On Windows versions prior to 10, neither the Modern calendar nor the Notification Center is available
+                if (!EnvironmentHelper.IsWindows10OrBetter && _clockClickAction > ClockClickOption.OpenAeroCalendar)
+                {
+                    return ClockClickOption.DoNothing;
+                }
+                // On Windows 11, the Notification Center replaces the Modern calendar
+                else if (EnvironmentHelper.IsWindows11OrBetter && _clockClickAction == ClockClickOption.OpenModernCalendar)
+                {
+                    return ClockClickOption.OpenNotificationCenter;
+                }
+
+                return _clockClickAction;
+            }
             set => SetEnum(ref _clockClickAction, value);
         }
 

From 4a4a99b4e09b0a182be5d0fcda668d7142154fad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaro=20Mart=C3=ADnez?= <xoas@airmail.cc>
Date: Tue, 7 Jan 2025 12:27:04 -0500
Subject: [PATCH 11/13] Update ManagedShell

So we can use and call the system flyouts via API.
---
 RetroBar/RetroBar.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RetroBar/RetroBar.csproj b/RetroBar/RetroBar.csproj
index c0ee916e..f40ba47c 100644
--- a/RetroBar/RetroBar.csproj
+++ b/RetroBar/RetroBar.csproj
@@ -42,7 +42,7 @@
 
   <ItemGroup>
     <PackageReference Include="gong-wpf-dragdrop" Version="3.1.1" />
-    <PackageReference Include="ManagedShell" Version="0.0.277" />
+    <PackageReference Include="ManagedShell" Version="0.0.282" />
     <PackageReference Include="System.Net.Http.Json" Version="6.0.2" />
   </ItemGroup>
 

From f78d9b4f23d420a389b3da10af18c37fb364a334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaro=20Mart=C3=ADnez?= <xoas@airmail.cc>
Date: Tue, 7 Jan 2025 12:42:13 -0500
Subject: [PATCH 12/13] Reenable Modern calendar flyout option for Windows 11

Let's use the API to invoke the system flyouts.
---
 RetroBar/Controls/Clock.xaml.cs           | 18 ++---
 RetroBar/PropertiesWindow.xaml.cs         |  9 +--
 RetroBar/Utilities/ClockFlyoutLauncher.cs | 83 +----------------------
 RetroBar/Utilities/Settings.cs            |  5 --
 4 files changed, 14 insertions(+), 101 deletions(-)

diff --git a/RetroBar/Controls/Clock.xaml.cs b/RetroBar/Controls/Clock.xaml.cs
index 48f42c5c..873c9aaa 100644
--- a/RetroBar/Controls/Clock.xaml.cs
+++ b/RetroBar/Controls/Clock.xaml.cs
@@ -8,6 +8,7 @@
 using System.Windows.Threading;
 using ManagedShell.Common.Helpers;
 using ManagedShell.Common.Logging;
+using ManagedShell.UWPInterop;
 using Microsoft.Win32;
 using RetroBar.Utilities;
 
@@ -164,21 +165,20 @@ private void Clock_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
             switch (Settings.Instance.ClockClickAction)
             {
                 case ClockClickOption.OpenModernCalendar:
-                    ClockFlyoutLauncher.ShowClockFlyout();
+                    Point screenPosition = PointToScreen(new(0, 0));
+                    ManagedShell.Interop.NativeMethods.Rect rect = new(
+                        (int)screenPosition.X, (int)screenPosition.Y,
+                        (int)(screenPosition.X + RenderSize.Width),
+                        (int)(screenPosition.Y + RenderSize.Height)
+                    );
+                    ImmersiveShellHelper.ShowClockFlyout(rect);
                     break;
                 case ClockClickOption.OpenAeroCalendar:
                     IntPtr hWnd = (PresentationSource.FromVisual(this) as System.Windows.Interop.HwndSource).Handle;
                     ClockFlyoutLauncher.ShowAeroClockFlyout(hWnd);
                     break;
                 case ClockClickOption.OpenNotificationCenter:
-                    if (EnvironmentHelper.IsWindows11OrBetter)
-                    {
-                        ShellHelper.ShowNotificationCenter();
-                    }
-                    else if (EnvironmentHelper.IsWindows10OrBetter)
-                    {
-                        ShellHelper.ShowActionCenter();
-                    }
+                    ImmersiveShellHelper.ShowActionCenter();
                     break;
             }
         }
diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
index 67822603..0d5ee08d 100644
--- a/RetroBar/PropertiesWindow.xaml.cs
+++ b/RetroBar/PropertiesWindow.xaml.cs
@@ -291,22 +291,19 @@ private void AutoStartCheckBox_OnChecked(object sender, RoutedEventArgs e)
 
         private void LoadClockActions()
         {
-            if (EnvironmentHelper.IsWindows10OrBetter && !EnvironmentHelper.IsWindows11OrBetter)
+            if (EnvironmentHelper.IsWindows10OrBetter)
             {
                 return;
             }
 
-            // Remove options unsupported prior to Windows 10 or not available for Windows 11.
+            // Remove options unsupported prior to Windows 10.
             var availableClockActions = (FindResource("clock_click_action_values") as Array)?.Cast<object>().ToList();
             if (availableClockActions == null)
             {
                 return;
             }
 
-            if (!EnvironmentHelper.IsWindows10OrBetter)
-            {
-                availableClockActions.RemoveAt((int)ClockClickOption.OpenNotificationCenter);
-            }
+            availableClockActions.RemoveAt((int)ClockClickOption.OpenNotificationCenter);
             availableClockActions.RemoveAt((int)ClockClickOption.OpenModernCalendar);
             cboClockAction.ItemsSource = availableClockActions;
         }
diff --git a/RetroBar/Utilities/ClockFlyoutLauncher.cs b/RetroBar/Utilities/ClockFlyoutLauncher.cs
index 3d416cc0..c9a98a16 100644
--- a/RetroBar/Utilities/ClockFlyoutLauncher.cs
+++ b/RetroBar/Utilities/ClockFlyoutLauncher.cs
@@ -1,11 +1,7 @@
-using ManagedShell.AppBar;
-using ManagedShell.Common.Helpers;
-using System;
+using System;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Windows;
+using ManagedShell.Common.Helpers;
 using static ManagedShell.Interop.NativeMethods;
-using Rect = ManagedShell.Interop.NativeMethods.Rect;
 using Screen = System.Windows.Forms.Screen;
 
 namespace RetroBar.Utilities
@@ -14,8 +10,6 @@ internal class ClockFlyoutLauncher
     {
         private const SetWindowPosFlags NoPosFlags = SetWindowPosFlags.SWP_NOSIZE | SetWindowPosFlags.SWP_NOACTIVATE | SetWindowPosFlags.SWP_NOZORDER;
 
-        #region Aero clock
-
         private static readonly Lazy<Type> AeroClockType = new(() => Type.GetTypeFromCLSID(new("A323554A-0FE1-4E49-AEE1-6722465D799F")));
         private static object _aeroClockInstance;
 
@@ -101,78 +95,5 @@ private static void FixAeroClockFlyoutPosition(Screen taskbarScreen)
 
             SetWindowPos(clockFlyoutHwnd, IntPtr.Zero, newX, newY, 0, 0, (int)NoPosFlags);
         }
-
-        #endregion Aero clock
-
-        #region Modern clock
-
-        internal static void ShowClockFlyout()
-        {
-            // Current implementation is for the primary screen only
-            Screen screen = Screen.PrimaryScreen;
-            FlowDirection flowDirection = Application.Current.FindResource("flow_direction") as FlowDirection? ?? FlowDirection.LeftToRight;
-
-            PostMessage(WindowHelper.FindWindowsTray(WindowHelper.FindWindowsTray(IntPtr.Zero)), (uint)0x5CE, IntPtr.Zero, IntPtr.Zero);
-
-            // Launching the Modern clock is slower than the Aero clock, so we need to wait for the window to be created...
-            System.Windows.Threading.DispatcherTimer timer = new()
-            {
-                Interval = TimeSpan.FromTicks(10)
-            };
-
-            int attempts = 0;
-            StringBuilder className = new(256);
-
-            timer.Tick += (_, _) =>
-            {
-                if (++attempts > 100)
-                {
-                    timer.Stop();
-                    return;
-                }
-
-                IntPtr hwnd = GetForegroundWindow();
-                if (hwnd == IntPtr.Zero)
-                {
-                    return;
-                }
-
-                className.Clear();
-                _ = GetClassName(hwnd, className, className.Capacity);
-                if (className.ToString() != "Windows.UI.Core.CoreWindow")
-                {
-                    return;
-                }
-
-                ShowWindow(hwnd, (int)WindowShowStyle.Hide);
-
-                if (!GetWindowRect(hwnd, out Rect rect) || rect.Width <= 1)
-                {
-                    return;
-                }
-
-                timer.Stop();
-
-                // Move to corner where the taskbar is
-                int newX = Settings.Instance.Edge switch
-                {
-                    AppBarEdge.Left => screen.WorkingArea.Left,
-                    AppBarEdge.Right => screen.WorkingArea.Right - rect.Width,
-                    _ => (flowDirection == FlowDirection.LeftToRight) ? screen.WorkingArea.Right - rect.Width : screen.WorkingArea.Left
-                };
-
-                int newY = Settings.Instance.Edge switch
-                {
-                    AppBarEdge.Top => screen.WorkingArea.Top,
-                    _ => screen.WorkingArea.Bottom - rect.Height
-                };
-
-                SetWindowPos(hwnd, IntPtr.Zero, newX, newY, 0, 0, (int)(NoPosFlags | SetWindowPosFlags.SWP_SHOWWINDOW));
-            };
-
-            timer.Start();
-        }
     }
-
-    #endregion Modern clock
 }
\ No newline at end of file
diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
index 531913fa..141f4c82 100644
--- a/RetroBar/Utilities/Settings.cs
+++ b/RetroBar/Utilities/Settings.cs
@@ -314,11 +314,6 @@ public ClockClickOption ClockClickAction
                 {
                     return ClockClickOption.DoNothing;
                 }
-                // On Windows 11, the Notification Center replaces the Modern calendar
-                else if (EnvironmentHelper.IsWindows11OrBetter && _clockClickAction == ClockClickOption.OpenModernCalendar)
-                {
-                    return ClockClickOption.OpenNotificationCenter;
-                }
 
                 return _clockClickAction;
             }

From d91764b5c76a074050eca586eb3c5538a87d8bcc Mon Sep 17 00:00:00 2001
From: Sam Johnson <sam@scj.me>
Date: Tue, 7 Jan 2025 19:13:18 -0600
Subject: [PATCH 13/13] Minor ImmersiveShell fixes

---
 RetroBar/Controls/Clock.xaml.cs        |  9 ++++++++-
 RetroBar/Utilities/StartMenuMonitor.cs | 23 ++++-------------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/RetroBar/Controls/Clock.xaml.cs b/RetroBar/Controls/Clock.xaml.cs
index 873c9aaa..33738e20 100644
--- a/RetroBar/Controls/Clock.xaml.cs
+++ b/RetroBar/Controls/Clock.xaml.cs
@@ -178,7 +178,14 @@ private void Clock_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
                     ClockFlyoutLauncher.ShowAeroClockFlyout(hWnd);
                     break;
                 case ClockClickOption.OpenNotificationCenter:
-                    ImmersiveShellHelper.ShowActionCenter();
+                    if (EnvironmentHelper.IsWindows10RS4OrBetter)
+                    {
+                        ImmersiveShellHelper.ShowActionCenter();
+                    }
+                    else
+                    {
+                        ShellHelper.ShowActionCenter();
+                    }
                     break;
             }
         }
diff --git a/RetroBar/Utilities/StartMenuMonitor.cs b/RetroBar/Utilities/StartMenuMonitor.cs
index 2bfc9edd..61fb0f06 100644
--- a/RetroBar/Utilities/StartMenuMonitor.cs
+++ b/RetroBar/Utilities/StartMenuMonitor.cs
@@ -4,6 +4,7 @@
 using ManagedShell.Common.Helpers;
 using ManagedShell.Common.Logging;
 using ManagedShell.Common.SupportingClasses;
+using ManagedShell.UWPInterop;
 using static ManagedShell.Interop.NativeMethods;
 
 namespace RetroBar.Utilities
@@ -120,7 +121,7 @@ private bool isVisibleByClass(string className)
             return IsWindowVisible(hStartMenu);
         }
 
-        private IImmersiveMonitor GetImmersiveMonitor(IServiceProvider shell, IntPtr hWnd)
+        private IImmersiveMonitor GetImmersiveMonitor(ManagedShell.UWPInterop.Interfaces.IServiceProvider shell, IntPtr hWnd)
         {
             if (shell.QueryService(ref CLSID_ImmersiveMonitorManager, ref IID_ImmersiveMonitorManager, out object monitorManagerObj) != 0)
             {
@@ -140,7 +141,7 @@ private IImmersiveMonitor GetImmersiveMonitor(IServiceProvider shell, IntPtr hWn
 
         private IImmersiveLauncher_Win10RS1 GetImmersiveLauncher_Win10RS1(IntPtr taskbarHwnd)
         {
-            var shell = (IServiceProvider)new CImmersiveShell();
+            var shell = ImmersiveShellHelper.GetImmersiveShell();
             if (shell.QueryService(ref CLSID_ImmersiveLauncher, ref IID_ImmersiveLauncher_Win10RS1, out object immersiveLauncherObj) != 0)
             {
                 ShellLogger.Warning("StartMenuMonitor: Failed to query for IImmersiveLauncher_Win10RS1");
@@ -160,7 +161,7 @@ private IImmersiveLauncher_Win10RS1 GetImmersiveLauncher_Win10RS1(IntPtr taskbar
 
         private IImmersiveLauncher_Win81 GetImmersiveLauncher_Win81(IntPtr taskbarHwnd)
         {
-            var shell = (IServiceProvider)new CImmersiveShell();
+            var shell = ImmersiveShellHelper.GetImmersiveShell();
             if (shell.QueryService(ref CLSID_ImmersiveLauncher, ref IID_ImmersiveLauncher_Win81, out object immersiveLauncherObj) != 0)
             {
                 ShellLogger.Warning("StartMenuMonitor: Failed to query for IImmersiveLauncher_Win81");
@@ -364,22 +365,6 @@ interface IImmersiveLauncher_Win81
         static Guid CLSID_ImmersiveLauncher = new Guid("6f86e01c-c649-4d61-be23-f1322ddeca9d");
         static Guid IID_ImmersiveLauncher_Win10RS1 = new Guid("d8d60399-a0f1-f987-5551-321fd1b49864");
         static Guid IID_ImmersiveLauncher_Win81 = new Guid("93f91f5a-a4ca-4205-9beb-ce4d17c708f9");
-
-        [ComImport]
-        [Guid("6d5140c1-7436-11ce-8034-00aa006009fa")]
-        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-        interface IServiceProvider
-        {
-            int QueryService(ref Guid guidService, ref Guid riid,
-                       [MarshalAs(UnmanagedType.Interface)] out object ppvObject);
-        }
-
-        [ComImport]
-        [Guid("c2f03a33-21f5-47fa-b4bb-156362a2f239")]
-        [ClassInterface(ClassInterfaceType.None)]
-        class CImmersiveShell
-        {
-        }
         #endregion
 
         public class StartMenuMonitorEventArgs : LauncherVisibilityEventArgs