From c41d206ff14b79f2f5e6adbc4eaa6256096357ce Mon Sep 17 00:00:00 2001
From: seasonyuu <seasonyuu@gmail.com>
Date: Wed, 13 Mar 2024 14:24:55 +0800
Subject: [PATCH 1/2] Fix mouse over color of TitleBarButton for
 TitleBarButtonType.Close

---
 src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml    |  2 ++
 .../Controls/TitleBar/TitleBarButton.cs       | 26 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml b/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
index afdd69040..7ddcc3435 100644
--- a/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
+++ b/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
@@ -15,6 +15,7 @@
         <Setter Property="Height" Value="30" />
         <Setter Property="MouseOverBackground" Value="{Binding Path=ButtonsBackground, RelativeSource={RelativeSource AncestorType={x:Type controls:TitleBar}}}" />
         <Setter Property="ButtonsForeground" Value="{Binding Path=ButtonsForeground, RelativeSource={RelativeSource AncestorType={x:Type controls:TitleBar}}}" />
+        <Setter Property="MouseOverButtonsForeground" Value="{Binding Path=MouseOverButtonsForeground, RelativeSource={RelativeSource AncestorType={x:Type controls:TitleBar}}}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -193,6 +194,7 @@
                                     x:Name="PART_CloseButton"
                                     Grid.Column="4"
                                     ButtonType="Close"
+                                    MouseOverButtonsForeground="White"
                                     MouseOverBackground="{DynamicResource PaletteRedBrush}" />
                             </Grid>
                         </Grid>
diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs b/src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs
index 876352858..e85dc4169 100644
--- a/src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs
+++ b/src/Wpf.Ui/Controls/TitleBar/TitleBarButton.cs
@@ -36,6 +36,19 @@ internal class TitleBarButton : Wpf.Ui.Controls.Button
         )
     );
 
+    /// <summary>
+    /// Property for <see cref="MouseOverButtonsForeground"/>.
+    /// </summary>
+    public static readonly DependencyProperty MouseOverButtonsForegroundProperty = DependencyProperty.Register(
+        nameof(MouseOverButtonsForeground),
+        typeof(Brush),
+        typeof(TitleBarButton),
+        new FrameworkPropertyMetadata(
+            SystemColors.ControlTextBrush,
+            FrameworkPropertyMetadataOptions.Inherits
+        )
+    );
+
     /// <summary>
     /// Sets or gets the
     /// </summary>
@@ -53,11 +66,20 @@ public Brush ButtonsForeground
         get => (Brush)GetValue(ButtonsForegroundProperty);
         set => SetValue(ButtonsForegroundProperty, value);
     }
+    /// <summary>
+    /// Foreground of the navigation buttons while mouse over.
+    /// </summary>
+    public Brush MouseOverButtonsForeground
+    {
+        get => (Brush)GetValue(MouseOverButtonsForegroundProperty);
+        set => SetValue(MouseOverButtonsForegroundProperty, value);
+    }
 
     public bool IsHovered { get; private set; }
 
     private User32.WM_NCHITTEST _returnValue;
     private Brush _defaultBackgroundBrush = Brushes.Transparent; //Should it be transparent?
+    private Brush _cacheButtonsForeground = SystemColors.ControlTextBrush; // cache ButtonsForeground while mouse over
 
     private bool _isClickedDown;
 
@@ -70,6 +92,8 @@ public void Hover()
             return;
 
         Background = MouseOverBackground;
+        _cacheButtonsForeground = ButtonsForeground;
+        ButtonsForeground = MouseOverButtonsForeground;
         IsHovered = true;
     }
 
@@ -82,6 +106,7 @@ public void RemoveHover()
             return;
 
         Background = _defaultBackgroundBrush;
+        ButtonsForeground = _cacheButtonsForeground;
 
         IsHovered = false;
         _isClickedDown = false;
@@ -119,7 +144,6 @@ internal bool ReactToHwndHook(User32.WM msg, IntPtr lParam, out IntPtr returnInt
 
                 RemoveHover();
                 return false;
-
             case User32.WM.NCMOUSELEAVE: // Mouse leaves the window
                 RemoveHover();
                 return false;

From 17689b8ec0c76511aa531295f5ae5433187b4533 Mon Sep 17 00:00:00 2001
From: seasonyuu <seasonyuu@gmail.com>
Date: Wed, 13 Mar 2024 14:30:02 +0800
Subject: [PATCH 2/2] Remove unused TitleBarButton mouse over trigger

---
 src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml b/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
index 7ddcc3435..04ba6cea8 100644
--- a/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
+++ b/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
@@ -46,9 +46,6 @@
                         </Viewbox>
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="LayoutRoot" Property="Background" Value="{Binding Path=MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-                        </Trigger>
                         <Trigger Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Help}">
                             <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Help}" />
                             <Setter TargetName="ViewBox" Property="Width" Value="13" />
@@ -75,14 +72,6 @@
                             <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Close}" />
                             <Setter TargetName="CanvasPath" Property="Data" Value="M36,41.1,6.15,71a3.44,3.44,0,0,1-2.53,1A3.55,3.55,0,0,1,0,68.38a3.44,3.44,0,0,1,1.05-2.53L30.9,36,1.05,6.15A3.49,3.49,0,0,1,0,3.59,3.51,3.51,0,0,1,.28,2.18,3.42,3.42,0,0,1,1.05,1,3.82,3.82,0,0,1,2.21.28,3.58,3.58,0,0,1,3.62,0,3.44,3.44,0,0,1,6.15,1.05L36,30.9,65.85,1.05a3.49,3.49,0,0,1,2.56-1A3.39,3.39,0,0,1,69.8.28,3.8,3.8,0,0,1,71,1.05a3.8,3.8,0,0,1,.77,1.15A3.39,3.39,0,0,1,72,3.59a3.49,3.49,0,0,1-1,2.56L41.1,36,71,65.85a3.44,3.44,0,0,1,1,2.53,3.58,3.58,0,0,1-.28,1.41A3.82,3.82,0,0,1,71,71a3.42,3.42,0,0,1-1.14.77,3.66,3.66,0,0,1-4-.77Z" />
                         </Trigger>
-
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Close}" />
-                                <Condition Property="IsMouseOver" Value="True" />
-                            </MultiTrigger.Conditions>
-                            <Setter Property="Foreground" Value="#FFFFFFFF" />
-                        </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>