From 7ffeba837db9ce467f55b2039150b4d8fb77dfe5 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sun, 22 Jan 2023 16:19:41 +0600
Subject: [PATCH 1/8] added TitleBarButton

---
 src/Wpf.Ui/Controls/TitleBar.cs               |  55 ++---
 src/Wpf.Ui/Controls/TitleBarButton.cs         | 204 ++++++++++++++++++
 src/Wpf.Ui/Styles/Controls/TitleBar.xaml      | 195 ++++++-----------
 ...itleBarButton.cs => TitleBarButtonType.cs} |   2 +-
 4 files changed, 291 insertions(+), 165 deletions(-)
 create mode 100644 src/Wpf.Ui/Controls/TitleBarButton.cs
 rename src/Wpf.Ui/TitleBar/{TitleBarButton.cs => TitleBarButtonType.cs} (96%)

diff --git a/src/Wpf.Ui/Controls/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBar.cs
index f95153e60..5d87358fc 100644
--- a/src/Wpf.Ui/Controls/TitleBar.cs
+++ b/src/Wpf.Ui/Controls/TitleBar.cs
@@ -17,8 +17,8 @@ namespace Wpf.Ui.Controls;
 /// Custom navigation buttons for the window.
 /// </summary>
 [TemplatePart(Name = "PART_MainGrid", Type = typeof(System.Windows.Controls.Grid))]
-[TemplatePart(Name = "PART_MaximizeButton", Type = typeof(Wpf.Ui.Controls.Button))]
-[TemplatePart(Name = "PART_RestoreButton", Type = typeof(Wpf.Ui.Controls.Button))]
+[TemplatePart(Name = "PART_MaximizeButton", Type = typeof(TitleBarButton))]
+[TemplatePart(Name = "PART_RestoreButton", Type = typeof(TitleBarButton))]
 public class TitleBar : System.Windows.Controls.Control, IThemeControl
 {
     private const string ElementMainGrid = "PART_MainGrid";
@@ -31,7 +31,7 @@ public class TitleBar : System.Windows.Controls.Control, IThemeControl
 
     internal Interop.WinDef.POINT _doubleClickPoint;
 
-    internal SnapLayout _snapLayout;
+    internal SnapLayout? _snapLayout;
 
     /// <summary>
     /// Property for <see cref="Theme"/>.
@@ -379,7 +379,7 @@ public event RoutedEventHandler HelpClicked
     /// </summary>
     public TitleBar()
     {
-        SetValue(TemplateButtonCommandProperty, new Common.RelayCommand<string>(o => OnTemplateButtonClick(o ?? String.Empty)));
+        SetValue(TemplateButtonCommandProperty, new Common.RelayCommand<TitleBarButtonType>(OnTemplateButtonClick));
 
         Loaded += OnLoaded;
     }
@@ -408,8 +408,8 @@ public override void OnApplyTemplate()
         base.OnApplyTemplate();
 
         var mainGrid = GetTemplateChild(ElementMainGrid) as System.Windows.Controls.Grid;
-        var maximizeButton = GetTemplateChild(ElementMaximizeButton) as Wpf.Ui.Controls.Button;
-        var restoreButton = GetTemplateChild(ElementRestoreButton) as Wpf.Ui.Controls.Button;
+        var maximizeButton = GetTemplateChild(ElementMaximizeButton) as TitleBarButton;
+        var restoreButton = GetTemplateChild(ElementRestoreButton) as TitleBarButton;
 
         if (mainGrid != null)
         {
@@ -417,8 +417,8 @@ public override void OnApplyTemplate()
             mainGrid.MouseMove += OnMainGridMouseMove;
         }
 
-        if (ShowMaximize && UseSnapLayout && maximizeButton != null && restoreButton != null)
-            InitializeSnapLayout(maximizeButton, restoreButton);
+        maximizeButton?.OnThemeChanged(Theme);
+        restoreButton?.OnThemeChanged(Theme);
     }
 
     /// <summary>
@@ -527,31 +527,6 @@ private bool MinimizeWindowToTray()
         return true;
     }
 
-    private void InitializeSnapLayout(Wpf.Ui.Controls.Button maximizeButton, Wpf.Ui.Controls.Button restoreButton)
-    {
-        if (!SnapLayout.IsSupported())
-            return;
-
-        _snapLayout = SnapLayout.Register(ParentWindow, maximizeButton, restoreButton);
-
-        // Can be taken it from the Template, but honestly - a classic - TODO: 
-        // ButtonsBackground, but
-        _snapLayout.HoverColorLight = new SolidColorBrush(Color.FromArgb(
-            (byte)0x1A,
-            (byte)0x00,
-            (byte)0x00,
-            (byte)0x00)
-        );
-        _snapLayout.HoverColorDark = new SolidColorBrush(Color.FromArgb(
-            (byte)0x17,
-            (byte)0xFF,
-            (byte)0xFF,
-            (byte)0xFF)
-        );
-
-        _snapLayout.Theme = Theme;
-    }
-
     private void OnMainGridMouseMove(object sender, MouseEventArgs e)
     {
         if (e.LeftButton != MouseButtonState.Pressed || ParentWindow == null)
@@ -612,31 +587,31 @@ private void OnMainGridMouseLeftButtonDown(object sender, MouseButtonEventArgs e
         MaximizeWindow();
     }
 
-    private void OnTemplateButtonClick(string parameter)
+    private void OnTemplateButtonClick(TitleBarButtonType buttonType)
     {
-        switch (parameter)
+        switch (buttonType)
         {
-            case "maximize":
+            case TitleBarButtonType.Maximize:
                 RaiseEvent(new RoutedEventArgs(MaximizeClickedEvent, this));
                 MaximizeWindow();
                 break;
 
-            case "restore":
+            case TitleBarButtonType.Restore:
                 RaiseEvent(new RoutedEventArgs(MaximizeClickedEvent, this));
                 RestoreWindow();
                 break;
 
-            case "close":
+            case TitleBarButtonType.Close:
                 RaiseEvent(new RoutedEventArgs(CloseClickedEvent, this));
                 CloseWindow();
                 break;
 
-            case "minimize":
+            case TitleBarButtonType.Minimize:
                 RaiseEvent(new RoutedEventArgs(MinimizeClickedEvent, this));
                 MinimizeWindow();
                 break;
 
-            case "help":
+            case TitleBarButtonType.Help:
                 RaiseEvent(new RoutedEventArgs(HelpClickedEvent, this));
                 break;
         }
diff --git a/src/Wpf.Ui/Controls/TitleBarButton.cs b/src/Wpf.Ui/Controls/TitleBarButton.cs
new file mode 100644
index 000000000..35f0f2b4e
--- /dev/null
+++ b/src/Wpf.Ui/Controls/TitleBarButton.cs
@@ -0,0 +1,204 @@
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation.Peers;
+using System.Windows.Automation.Provider;
+using System.Windows.Interop;
+using System.Windows.Media;
+using Wpf.Ui.Appearance;
+using Wpf.Ui.Interop;
+using Wpf.Ui.TitleBar;
+
+namespace Wpf.Ui.Controls;
+
+public class TitleBarButton : Wpf.Ui.Controls.Button
+{
+    public static readonly DependencyProperty ButtonTypeProperty = DependencyProperty.Register(nameof(ButtonType),
+        typeof(TitleBarButtonType), typeof(TitleBarButton), new PropertyMetadata(TitleBarButtonType.Unknown));
+
+    /// <summary>
+    /// Property for <see cref="ButtonsForeground"/>.
+    /// </summary>
+    public static readonly DependencyProperty ButtonsForegroundProperty = DependencyProperty.Register(
+        nameof(ButtonsForeground),
+        typeof(Brush), typeof(TitleBarButton), new FrameworkPropertyMetadata(SystemColors.ControlTextBrush,
+            FrameworkPropertyMetadataOptions.Inherits));
+
+    public TitleBarButtonType ButtonType
+    {
+        get => (TitleBarButtonType)GetValue(ButtonTypeProperty);
+        set => SetValue(ButtonTypeProperty, value);
+    }
+    
+    /// <summary>
+    /// Foreground of the navigation buttons.
+    /// </summary>
+    public Brush ButtonsForeground
+    {
+        get => (Brush)GetValue(ButtonsForegroundProperty);
+        set => SetValue(ButtonsForegroundProperty, value);
+    }
+
+    public bool IsHovered { get; private set; }
+
+    /*private static SolidColorBrush _hoverColorLight = new SolidColorBrush(Color.FromArgb(
+        (byte)0x1A,
+        (byte)0x00,
+        (byte)0x00,
+        (byte)0x00));
+
+    private static SolidColorBrush _hoverColorDark = new SolidColorBrush(Color.FromArgb(
+        (byte)0x17,
+        (byte)0xFF,
+        (byte)0xFF,
+        (byte)0xFF));*/
+
+    private HwndSource? _hwndSource;
+    private User32.WM_NCHITTEST _returnValue;
+    private Brush _defaultBackgroundBrush = null!;
+
+    private bool _isClickedDown;
+
+    public TitleBarButton()
+    {
+        Loaded += (_, _) =>
+        {
+            _defaultBackgroundBrush = Background;
+
+            if (ButtonType == TitleBarButtonType.Unknown)
+                return;
+
+            _hwndSource = PresentationSource.FromVisual(this) as HwndSource ??
+                          throw new ArgumentNullException($"HwndSource is null");
+
+            _hwndSource.AddHook(Hook);
+
+            _returnValue = ButtonType switch
+            {
+                TitleBarButtonType.Help => User32.WM_NCHITTEST.HTHELP,
+                TitleBarButtonType.Minimize => User32.WM_NCHITTEST.HTMINBUTTON,
+                TitleBarButtonType.Close => User32.WM_NCHITTEST.HTCLOSE,
+                TitleBarButtonType.Restore => User32.WM_NCHITTEST.HTMAXBUTTON,
+                TitleBarButtonType.Maximize => User32.WM_NCHITTEST.HTMAXBUTTON,
+                _ => throw new ArgumentOutOfRangeException()
+            };
+        };
+
+        Unloaded += (_, _) => _hwndSource?.RemoveHook(Hook);
+    }
+
+    public void OnThemeChanged(ThemeType themeType)
+    {
+        /*_hoverBrush = themeType == ThemeType.Light ? _hoverColorLight : _hoverColorDark;*/
+    }
+
+    private IntPtr Hook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+    {
+        switch ((User32.WM)msg)
+        {
+            case User32.WM.MOVE:
+                // Adjust [Size] of the buttons if the DPI is changed
+                break;
+
+            // Hit test, for determining whether the mouse cursor is over one of the buttons
+            case User32.WM.NCHITTEST:
+                if (IsMouseOverElement(lParam))
+                {
+                    Hover();
+                    handled = true;
+                    return (IntPtr)_returnValue;
+                }
+
+                RemoveHover();
+                break;
+
+            // Mouse leaves the window
+            case User32.WM.NCMOUSELEAVE:
+                RemoveHover();
+                break;
+
+            // Left button clicked down
+            case User32.WM.NCLBUTTONDOWN:
+                if (IsMouseOverElement(lParam))
+                {
+                    _isClickedDown = true;
+                    handled = true;
+                }
+                break;
+
+            // Left button clicked up
+            case User32.WM.NCLBUTTONUP:
+                if (_isClickedDown && IsMouseOverElement(lParam))
+                {
+                    InvokeClick();
+                    handled = true;
+                }
+                break;
+        }
+
+        return IntPtr.Zero;
+    }
+
+    /// <summary>
+    /// Do not call it outside of NCHITTEST message!
+    /// </summary>
+    private bool IsMouseOverElement(IntPtr lParam)
+    {
+        // This method will be invoked very often and must be as simple as possible.
+
+        if (lParam == IntPtr.Zero)
+            return false;
+
+        var mousePosScreen = new Point(Get_X_LParam(lParam), Get_Y_LParam(lParam));
+        var bounds = new Rect(new Point(), RenderSize);
+        var mousePosRelative = PointFromScreen(mousePosScreen);
+        return bounds.Contains(mousePosRelative);
+    }
+
+    /// <summary>
+    /// Invokes click on the button.
+    /// </summary>
+    private void InvokeClick()
+    {
+        if (new ButtonAutomationPeer(this).GetPattern(PatternInterface.Invoke) is IInvokeProvider invokeProvider)
+            invokeProvider.Invoke();
+
+        _isClickedDown = false;
+    }
+
+    /// <summary>
+    /// Forces button background to change.
+    /// </summary>
+    private void Hover()
+    {
+        if (IsHovered)
+            return;
+
+        Background = MouseOverBackground;
+        IsHovered = true;
+    }
+
+    /// <summary>
+    /// Forces button background to change.
+    /// </summary>
+    public void RemoveHover()
+    {
+        if (!IsHovered)
+            return;
+
+        Background = _defaultBackgroundBrush;
+
+        IsHovered = false;
+        _isClickedDown = false;
+    }
+
+    private static int Get_X_LParam(IntPtr lParam)
+    {
+        return (short)(lParam.ToInt32() & 0xFFFF);
+    }
+
+    private static int Get_Y_LParam(IntPtr lParam)
+    {
+        return (short)(lParam.ToInt32() >> 16);
+    }
+}
diff --git a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
index e0d1ee4b8..6fcc69108 100644
--- a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
+++ b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
@@ -8,62 +8,82 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
+    xmlns:titleBar="clr-namespace:Wpf.Ui.TitleBar">
 
-    <Style x:Key="UiTitlebarButton" TargetType="{x:Type controls:Button}">
+    <Style TargetType="{x:Type controls:TitleBarButton}">
         <Setter Property="Width" Value="44" />
         <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="Background" Value="Transparent" />
-        <Setter Property="MouseOverBackground" Value="Transparent" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
-        <Setter Property="Focusable" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:Button}">
-                    <Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}">
-                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="LayoutRoot" Property="Background" Value="{Binding Path=MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="UiTitlebarCloseButton" TargetType="{x:Type controls:Button}">
-        <Setter Property="Width" Value="44" />
-        <Setter Property="Height" Value="30" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="MouseOverBackground" Value="Transparent" />
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
-        <Setter Property="Focusable" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Command" Value="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource AncestorType={x:Type controls:TitleBar}}}" />
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
+        <Setter Property="Focusable" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:Button}">
+                <ControlTemplate TargetType="{x:Type controls:TitleBarButton}">
                     <Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}">
                         <Viewbox
+                            x:Name="ViewBox"
                             Width="11"
                             Height="11"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
+                            Focusable="False"
                             RenderOptions.BitmapScalingMode="HighQuality">
-                            <Canvas Width="72" Height="72">
-                                <Path Data="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" Fill="{TemplateBinding Foreground}" />
+                            <Canvas
+                                x:Name="Canvas"
+                                Width="72"
+                                Height="72"
+                                Focusable="False">
+                                <Path x:Name="CanvasPath" Fill="{TemplateBinding ButtonsForeground}" />
                             </Canvas>
                         </Viewbox>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource PaletteRedBrush}" />
-                            <Setter Property="Foreground" Value="#FFFFFFFF" />
+                            <Setter TargetName="LayoutRoot" Property="Background" Value="{Binding Path=MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
+                        </Trigger>
+                        <Trigger Property="ButtonType" Value="{x:Static titleBar:TitleBarButtonType.Help}">
+                            <Setter Property="CommandParameter" Value="{x:Static titleBar:TitleBarButtonType.Help}" />
+                            <Setter TargetName="ViewBox" Property="Width" Value="13" />
+                            <Setter TargetName="ViewBox" Property="Height" Value="13" />
+                            <Setter TargetName="Canvas" Property="Width" Value="24" />
+                            <Setter TargetName="Canvas" Property="Height" Value="41" />
+                            <Setter TargetName="CanvasPath" Property="Data" Value="M20.56,11.57c0-1.19-.24-2.31-.71-3.36-.47-1.05-1.11-1.96-1.92-2.74-.8-.78-1.74-1.4-2.81-1.85-1.07-.45-2.2-.68-3.37-.68s-2.37,.23-3.44,.69c-1.07,.46-2,1.09-2.8,1.88s-1.42,1.73-1.88,2.8c-.46,1.07-.69,2.22-.69,3.44,0,.4-.15,.74-.44,1.03s-.64,.44-1.03,.44c-.49,0-.86-.17-1.1-.52-.25-.34-.37-.74-.37-1.18,0-1.59,.32-3.09,.95-4.49,.63-1.4,1.49-2.62,2.57-3.66,1.08-1.04,2.33-1.86,3.74-2.47,1.42-.6,2.91-.91,4.49-.91s3.07,.3,4.49,.91c1.42,.6,2.66,1.43,3.74,2.47,1.08,1.04,1.93,2.26,2.57,3.66,.63,1.4,.95,2.9,.95,4.49,0,1.24-.13,2.32-.39,3.25-.26,.93-.63,1.77-1.12,2.54-.49,.77-1.08,1.49-1.78,2.18-.7,.69-1.48,1.42-2.35,2.2-.44,.4-.88,.78-1.31,1.16-.43,.38-.84,.78-1.24,1.21-.5,.55-.89,1.08-1.17,1.59-.28,.51-.48,1.03-.62,1.56-.14,.53-.22,1.09-.25,1.69-.03,.6-.05,1.25-.05,1.95,0,.4-.15,.74-.44,1.03-.29,.29-.64,.44-1.03,.44-.34,0-.6-.06-.79-.18-.19-.12-.34-.29-.44-.49-.1-.21-.17-.44-.2-.7-.03-.26-.05-.52-.05-.78v-.78c0-1.21,.15-2.28,.44-3.2,.29-.93,.68-1.76,1.16-2.5,.48-.74,1.03-1.41,1.65-2.02,.62-.6,1.25-1.19,1.89-1.74,.64-.56,1.27-1.11,1.88-1.66,.61-.55,1.16-1.15,1.64-1.8,.48-.65,.87-1.37,1.17-2.16,.3-.79,.45-1.69,.45-2.72Zm-11.02,27.36c0-.61,.21-1.13,.64-1.56,.43-.43,.95-.64,1.56-.64s1.13,.21,1.56,.64c.43,.43,.64,.95,.64,1.56s-.21,1.13-.64,1.56c-.43,.43-.95,.64-1.56,.64s-1.13-.21-1.56-.64c-.43-.43-.64-.95-.64-1.56Z" />
+                        </Trigger>
+                        <Trigger Property="ButtonType" Value="{x:Static titleBar:TitleBarButtonType.Minimize}">
+                            <Setter Property="CommandParameter" Value="{x:Static titleBar:TitleBarButtonType.Minimize}" />
+                            <Setter TargetName="Canvas" Property="Width" Value="72" />
+                            <Setter TargetName="Canvas" Property="Height" Value="8" />
+                            <Setter TargetName="CanvasPath" Property="Data" Value="M3.59,7.21A3.56,3.56,0,0,1,2.2,6.93a3.66,3.66,0,0,1-1.15-.78A3.88,3.88,0,0,1,.28,5,3.42,3.42,0,0,1,0,3.62,3.45,3.45,0,0,1,.28,2.23a4.12,4.12,0,0,1,.77-1.16A3.52,3.52,0,0,1,2.2.28,3.39,3.39,0,0,1,3.59,0H68.41A3.39,3.39,0,0,1,69.8.28,3.52,3.52,0,0,1,71,1.07a4.12,4.12,0,0,1,.77,1.16A3.45,3.45,0,0,1,72,3.62,3.42,3.42,0,0,1,71.72,5,3.88,3.88,0,0,1,71,6.15a3.66,3.66,0,0,1-1.15.78,3.56,3.56,0,0,1-1.39.28Z" />
+                        </Trigger>
+                        <Trigger Property="ButtonType" Value="{x:Static titleBar:TitleBarButtonType.Restore}">
+                            <Setter Property="CommandParameter" Value="{x:Static titleBar:TitleBarButtonType.Restore}" />
+                            <Setter TargetName="CanvasPath" Property="Data" Value="M10.62,72a9.92,9.92,0,0,1-4-.86A11.15,11.15,0,0,1,.86,65.43,9.92,9.92,0,0,1,0,61.38V25A9.86,9.86,0,0,1,.86,21,11.32,11.32,0,0,1,3.18,17.6a11,11,0,0,1,3.38-2.32,9.68,9.68,0,0,1,4.06-.87H47a9.84,9.84,0,0,1,4.08.87A11,11,0,0,1,56.72,21,9.84,9.84,0,0,1,57.59,25V61.38a9.68,9.68,0,0,1-.87,4.06,11,11,0,0,1-2.32,3.38A11.32,11.32,0,0,1,51,71.14,9.86,9.86,0,0,1,47,72Zm36.17-7.21a3.39,3.39,0,0,0,1.39-.28,3.79,3.79,0,0,0,1.16-.77,3.47,3.47,0,0,0,1.07-2.53v-36a3.55,3.55,0,0,0-.28-1.41,3.51,3.51,0,0,0-.77-1.16,3.67,3.67,0,0,0-1.16-.77,3.55,3.55,0,0,0-1.41-.28h-36a3.45,3.45,0,0,0-1.39.28,3.59,3.59,0,0,0-1.14.79,3.79,3.79,0,0,0-.77,1.16,3.39,3.39,0,0,0-.28,1.39v36a3.45,3.45,0,0,0,.28,1.39A3.62,3.62,0,0,0,9.4,64.51a3.45,3.45,0,0,0,1.39.28Zm18-43.45a13.14,13.14,0,0,0-1.16-5.5,14.41,14.41,0,0,0-3.14-4.5,15,15,0,0,0-4.61-3,14.14,14.14,0,0,0-5.5-1.1H15A10.73,10.73,0,0,1,21.88.51,10.93,10.93,0,0,1,25.21,0H50.38a20.82,20.82,0,0,1,8.4,1.71A21.72,21.72,0,0,1,70.29,13.18,20.91,20.91,0,0,1,72,21.59v25.2a10.93,10.93,0,0,1-.51,3.33A10.71,10.71,0,0,1,70,53.05a10.84,10.84,0,0,1-2.28,2.36,10.66,10.66,0,0,1-3,1.58Z" />
+                        </Trigger>
+                        <Trigger Property="ButtonType" Value="{x:Static titleBar:TitleBarButtonType.Maximize}">
+                            <Setter Property="CommandParameter" Value="{x:Static titleBar:TitleBarButtonType.Maximize}" />
+                            <Setter TargetName="CanvasPath" Property="Data" Value="M10.62,72a9.92,9.92,0,0,1-4-.86A11.15,11.15,0,0,1,.86,65.43,9.92,9.92,0,0,1,0,61.38V10.62a9.92,9.92,0,0,1,.86-4A11.15,11.15,0,0,1,6.57.86a9.92,9.92,0,0,1,4-.86H61.38a9.92,9.92,0,0,1,4.05.86,11.15,11.15,0,0,1,5.71,5.71,9.92,9.92,0,0,1,.86,4V61.38a9.92,9.92,0,0,1-.86,4.05,11.15,11.15,0,0,1-5.71,5.71,9.92,9.92,0,0,1-4.05.86Zm50.59-7.21a3.45,3.45,0,0,0,1.39-.28,3.62,3.62,0,0,0,1.91-1.91,3.45,3.45,0,0,0,.28-1.39V10.79a3.45,3.45,0,0,0-.28-1.39A3.62,3.62,0,0,0,62.6,7.49a3.45,3.45,0,0,0-1.39-.28H10.79a3.45,3.45,0,0,0-1.39.28A3.62,3.62,0,0,0,7.49,9.4a3.45,3.45,0,0,0-.28,1.39V61.21a3.45,3.45,0,0,0,.28,1.39A3.62,3.62,0,0,0,9.4,64.51a3.45,3.45,0,0,0,1.39.28Z" />
                         </Trigger>
+                        <Trigger Property="ButtonType" Value="{x:Static titleBar:TitleBarButtonType.Close}">
+                            <Setter Property="CommandParameter" Value="{x:Static titleBar: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 titleBar:TitleBarButtonType.Close}" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <MultiTrigger.Setters>
+                                <Setter Property="Foreground" Value="#FFFFFFFF" />
+                            </MultiTrigger.Setters>
+                        </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -155,106 +175,33 @@
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
 
-                                <controls:Button
+                                <controls:TitleBarButton
                                     x:Name="ButtonHelp"
                                     Grid.Column="0"
-                                    Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    CommandParameter="help"
-                                    KeyboardNavigation.IsTabStop="True"
-                                    MouseOverBackground="{TemplateBinding ButtonsBackground}"
-                                    Style="{StaticResource UiTitlebarButton}">
-                                    <Viewbox
-                                        Width="13"
-                                        Height="13"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Focusable="False"
-                                        RenderOptions.BitmapScalingMode="HighQuality">
-                                        <Canvas
-                                            Width="24"
-                                            Height="41"
-                                            Focusable="False">
-                                            <Path Data="M20.56,11.57c0-1.19-.24-2.31-.71-3.36-.47-1.05-1.11-1.96-1.92-2.74-.8-.78-1.74-1.4-2.81-1.85-1.07-.45-2.2-.68-3.37-.68s-2.37,.23-3.44,.69c-1.07,.46-2,1.09-2.8,1.88s-1.42,1.73-1.88,2.8c-.46,1.07-.69,2.22-.69,3.44,0,.4-.15,.74-.44,1.03s-.64,.44-1.03,.44c-.49,0-.86-.17-1.1-.52-.25-.34-.37-.74-.37-1.18,0-1.59,.32-3.09,.95-4.49,.63-1.4,1.49-2.62,2.57-3.66,1.08-1.04,2.33-1.86,3.74-2.47,1.42-.6,2.91-.91,4.49-.91s3.07,.3,4.49,.91c1.42,.6,2.66,1.43,3.74,2.47,1.08,1.04,1.93,2.26,2.57,3.66,.63,1.4,.95,2.9,.95,4.49,0,1.24-.13,2.32-.39,3.25-.26,.93-.63,1.77-1.12,2.54-.49,.77-1.08,1.49-1.78,2.18-.7,.69-1.48,1.42-2.35,2.2-.44,.4-.88,.78-1.31,1.16-.43,.38-.84,.78-1.24,1.21-.5,.55-.89,1.08-1.17,1.59-.28,.51-.48,1.03-.62,1.56-.14,.53-.22,1.09-.25,1.69-.03,.6-.05,1.25-.05,1.95,0,.4-.15,.74-.44,1.03-.29,.29-.64,.44-1.03,.44-.34,0-.6-.06-.79-.18-.19-.12-.34-.29-.44-.49-.1-.21-.17-.44-.2-.7-.03-.26-.05-.52-.05-.78v-.78c0-1.21,.15-2.28,.44-3.2,.29-.93,.68-1.76,1.16-2.5,.48-.74,1.03-1.41,1.65-2.02,.62-.6,1.25-1.19,1.89-1.74,.64-.56,1.27-1.11,1.88-1.66,.61-.55,1.16-1.15,1.64-1.8,.48-.65,.87-1.37,1.17-2.16,.3-.79,.45-1.69,.45-2.72Zm-11.02,27.36c0-.61,.21-1.13,.64-1.56,.43-.43,.95-.64,1.56-.64s1.13,.21,1.56,.64c.43,.43,.64,.95,.64,1.56s-.21,1.13-.64,1.56c-.43,.43-.95,.64-1.56,.64s-1.13-.21-1.56-.64c-.43-.43-.64-.95-.64-1.56Z" Fill="{TemplateBinding ButtonsForeground}" />
-                                        </Canvas>
-                                    </Viewbox>
-                                </controls:Button>
-                                <controls:Button
+                                    ButtonType="Help" />
+                                <controls:TitleBarButton
                                     x:Name="ButtonMinimize"
                                     Grid.Column="1"
-                                    Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    CommandParameter="minimize"
-                                    KeyboardNavigation.IsTabStop="True"
-                                    MouseOverBackground="{TemplateBinding ButtonsBackground}"
-                                    Style="{StaticResource UiTitlebarButton}">
-                                    <Viewbox
-                                        Width="11"
-                                        Height="11"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Focusable="False"
-                                        RenderOptions.BitmapScalingMode="HighQuality">
-                                        <Canvas
-                                            Width="72"
-                                            Height="8"
-                                            Focusable="False">
-                                            <Path Data="M3.59,7.21A3.56,3.56,0,0,1,2.2,6.93a3.66,3.66,0,0,1-1.15-.78A3.88,3.88,0,0,1,.28,5,3.42,3.42,0,0,1,0,3.62,3.45,3.45,0,0,1,.28,2.23a4.12,4.12,0,0,1,.77-1.16A3.52,3.52,0,0,1,2.2.28,3.39,3.39,0,0,1,3.59,0H68.41A3.39,3.39,0,0,1,69.8.28,3.52,3.52,0,0,1,71,1.07a4.12,4.12,0,0,1,.77,1.16A3.45,3.45,0,0,1,72,3.62,3.42,3.42,0,0,1,71.72,5,3.88,3.88,0,0,1,71,6.15a3.66,3.66,0,0,1-1.15.78,3.56,3.56,0,0,1-1.39.28Z" Fill="{TemplateBinding ButtonsForeground}" />
-                                        </Canvas>
-                                    </Viewbox>
-                                </controls:Button>
-                                <controls:Button
+                                    ButtonType="Minimize" />
+                                <controls:TitleBarButton
                                     x:Name="PART_MaximizeButton"
                                     Grid.Column="2"
-                                    Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    CommandParameter="maximize"
-                                    KeyboardNavigation.IsTabStop="True"
-                                    MouseOverBackground="{TemplateBinding ButtonsBackground}"
-                                    Style="{StaticResource UiTitlebarButton}">
-                                    <Viewbox
-                                        Width="11"
-                                        Height="11"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Focusable="False"
-                                        RenderOptions.BitmapScalingMode="HighQuality">
-                                        <Canvas
-                                            Width="72"
-                                            Height="72"
-                                            Focusable="False">
-                                            <Path Data="M10.62,72a9.92,9.92,0,0,1-4-.86A11.15,11.15,0,0,1,.86,65.43,9.92,9.92,0,0,1,0,61.38V10.62a9.92,9.92,0,0,1,.86-4A11.15,11.15,0,0,1,6.57.86a9.92,9.92,0,0,1,4-.86H61.38a9.92,9.92,0,0,1,4.05.86,11.15,11.15,0,0,1,5.71,5.71,9.92,9.92,0,0,1,.86,4V61.38a9.92,9.92,0,0,1-.86,4.05,11.15,11.15,0,0,1-5.71,5.71,9.92,9.92,0,0,1-4.05.86Zm50.59-7.21a3.45,3.45,0,0,0,1.39-.28,3.62,3.62,0,0,0,1.91-1.91,3.45,3.45,0,0,0,.28-1.39V10.79a3.45,3.45,0,0,0-.28-1.39A3.62,3.62,0,0,0,62.6,7.49a3.45,3.45,0,0,0-1.39-.28H10.79a3.45,3.45,0,0,0-1.39.28A3.62,3.62,0,0,0,7.49,9.4a3.45,3.45,0,0,0-.28,1.39V61.21a3.45,3.45,0,0,0,.28,1.39A3.62,3.62,0,0,0,9.4,64.51a3.45,3.45,0,0,0,1.39.28Z" Fill="{TemplateBinding ButtonsForeground}" />
-                                        </Canvas>
-                                    </Viewbox>
-                                </controls:Button>
-                                <controls:Button
+                                    ButtonType="Maximize" />
+                                <controls:TitleBarButton
                                     x:Name="PART_RestoreButton"
                                     Grid.Column="3"
-                                    Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    CommandParameter="restore"
-                                    KeyboardNavigation.IsTabStop="True"
-                                    MouseOverBackground="{TemplateBinding ButtonsBackground}"
-                                    Style="{StaticResource UiTitlebarButton}"
-                                    Visibility="Collapsed">
-                                    <Viewbox
-                                        Width="11"
-                                        Height="11"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Focusable="False"
-                                        RenderOptions.BitmapScalingMode="HighQuality">
-                                        <Canvas
-                                            Width="72"
-                                            Height="72"
-                                            Focusable="False">
-                                            <Path Data="M10.62,72a9.92,9.92,0,0,1-4-.86A11.15,11.15,0,0,1,.86,65.43,9.92,9.92,0,0,1,0,61.38V25A9.86,9.86,0,0,1,.86,21,11.32,11.32,0,0,1,3.18,17.6a11,11,0,0,1,3.38-2.32,9.68,9.68,0,0,1,4.06-.87H47a9.84,9.84,0,0,1,4.08.87A11,11,0,0,1,56.72,21,9.84,9.84,0,0,1,57.59,25V61.38a9.68,9.68,0,0,1-.87,4.06,11,11,0,0,1-2.32,3.38A11.32,11.32,0,0,1,51,71.14,9.86,9.86,0,0,1,47,72Zm36.17-7.21a3.39,3.39,0,0,0,1.39-.28,3.79,3.79,0,0,0,1.16-.77,3.47,3.47,0,0,0,1.07-2.53v-36a3.55,3.55,0,0,0-.28-1.41,3.51,3.51,0,0,0-.77-1.16,3.67,3.67,0,0,0-1.16-.77,3.55,3.55,0,0,0-1.41-.28h-36a3.45,3.45,0,0,0-1.39.28,3.59,3.59,0,0,0-1.14.79,3.79,3.79,0,0,0-.77,1.16,3.39,3.39,0,0,0-.28,1.39v36a3.45,3.45,0,0,0,.28,1.39A3.62,3.62,0,0,0,9.4,64.51a3.45,3.45,0,0,0,1.39.28Zm18-43.45a13.14,13.14,0,0,0-1.16-5.5,14.41,14.41,0,0,0-3.14-4.5,15,15,0,0,0-4.61-3,14.14,14.14,0,0,0-5.5-1.1H15A10.73,10.73,0,0,1,21.88.51,10.93,10.93,0,0,1,25.21,0H50.38a20.82,20.82,0,0,1,8.4,1.71A21.72,21.72,0,0,1,70.29,13.18,20.91,20.91,0,0,1,72,21.59v25.2a10.93,10.93,0,0,1-.51,3.33A10.71,10.71,0,0,1,70,53.05a10.84,10.84,0,0,1-2.28,2.36,10.66,10.66,0,0,1-3,1.58Z" Fill="{TemplateBinding ButtonsForeground}" />
-                                        </Canvas>
-                                    </Viewbox>
-                                </controls:Button>
-                                <controls:Button
+                                    Width="0"
+                                    Height="0"
+                                    ButtonType="Restore"
+                                    IsEnabled="False"
+                                    IsHitTestVisible="False"
+                                    Visibility="Collapsed" />
+
+                                <controls:TitleBarButton
                                     x:Name="PART_CloseButton"
                                     Grid.Column="4"
-                                    Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                                    CommandParameter="close"
-                                    KeyboardNavigation.IsTabStop="True"
-                                    Style="{StaticResource UiTitlebarCloseButton}"
+                                    ButtonType="Close"
+                                    MouseOverBackground="{DynamicResource PaletteRedBrush}"
                                     Visibility="Collapsed" />
                             </Grid>
                         </Grid>
diff --git a/src/Wpf.Ui/TitleBar/TitleBarButton.cs b/src/Wpf.Ui/TitleBar/TitleBarButtonType.cs
similarity index 96%
rename from src/Wpf.Ui/TitleBar/TitleBarButton.cs
rename to src/Wpf.Ui/TitleBar/TitleBarButtonType.cs
index 7d02b9bfe..af2f0533d 100644
--- a/src/Wpf.Ui/TitleBar/TitleBarButton.cs
+++ b/src/Wpf.Ui/TitleBar/TitleBarButtonType.cs
@@ -8,7 +8,7 @@ namespace Wpf.Ui.TitleBar;
 /// <summary>
 /// Type of the Title Bar button.
 /// </summary>
-internal enum TitleBarButton
+public enum TitleBarButtonType
 {
     /// <summary>
     /// Unknown button.

From 26935882c8d29e1afcaaa01d087600ad266ec89d Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sun, 22 Jan 2023 17:12:40 +0600
Subject: [PATCH 2/8] moved HwndSourceHook to the title bar

---
 src/Wpf.Ui/Controls/TitleBar.cs          | 199 +++++++++++++++--------
 src/Wpf.Ui/Controls/TitleBarButton.cs    |  55 +++----
 src/Wpf.Ui/Styles/Controls/TitleBar.xaml |  12 +-
 3 files changed, 160 insertions(+), 106 deletions(-)

diff --git a/src/Wpf.Ui/Controls/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBar.cs
index 5d87358fc..1b8939340 100644
--- a/src/Wpf.Ui/Controls/TitleBar.cs
+++ b/src/Wpf.Ui/Controls/TitleBar.cs
@@ -5,10 +5,14 @@
 
 using System;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Windows;
 using System.Windows.Input;
+using System.Windows.Interop;
 using System.Windows.Media;
+using Wpf.Ui.Common;
 using Wpf.Ui.Dpi;
+using Wpf.Ui.Interop;
 using Wpf.Ui.TitleBar;
 
 namespace Wpf.Ui.Controls;
@@ -16,22 +20,22 @@ namespace Wpf.Ui.Controls;
 /// <summary>
 /// Custom navigation buttons for the window.
 /// </summary>
-[TemplatePart(Name = "PART_MainGrid", Type = typeof(System.Windows.Controls.Grid))]
-[TemplatePart(Name = "PART_MaximizeButton", Type = typeof(TitleBarButton))]
-[TemplatePart(Name = "PART_RestoreButton", Type = typeof(TitleBarButton))]
+[TemplatePart(Name = ElementMainGrid, Type = typeof(System.Windows.Controls.Grid))]
+[TemplatePart(Name = ElementHelpButton, Type = typeof(TitleBarButton))]
+[TemplatePart(Name = ElementMinimizeButton, Type = typeof(TitleBarButton))]
+[TemplatePart(Name = ElementMaximizeButton, Type = typeof(TitleBarButton))]
+[TemplatePart(Name = ElementRestoreButton, Type = typeof(TitleBarButton))]
+[TemplatePart(Name = ElementCloseButton, Type = typeof(TitleBarButton))]
 public class TitleBar : System.Windows.Controls.Control, IThemeControl
 {
     private const string ElementMainGrid = "PART_MainGrid";
-
+    private const string ElementHelpButton = "PART_HelpButton";
+    private const string ElementMinimizeButton = "PART_MinimizeButton";
     private const string ElementMaximizeButton = "PART_MaximizeButton";
-
     private const string ElementRestoreButton = "PART_RestoreButton";
+    private const string ElementCloseButton = "PART_CloseButton";
 
-    private System.Windows.Window _parent;
-
-    internal Interop.WinDef.POINT _doubleClickPoint;
-
-    internal SnapLayout? _snapLayout;
+    #region Static properties
 
     /// <summary>
     /// Property for <see cref="Theme"/>.
@@ -174,6 +178,10 @@ public class TitleBar : System.Windows.Controls.Control, IThemeControl
         DependencyProperty.Register(nameof(TemplateButtonCommand),
             typeof(Common.IRelayCommand), typeof(TitleBar), new PropertyMetadata(null));
 
+    #endregion
+
+    #region Properties
+
     /// <inheritdoc />
     public Appearance.ThemeType Theme
     {
@@ -357,22 +365,24 @@ public event RoutedEventHandler HelpClicked
     /// <summary>
     /// Command triggered after clicking the titlebar button.
     /// </summary>
-    public Common.IRelayCommand TemplateButtonCommand => (Common.IRelayCommand)GetValue(TemplateButtonCommandProperty);
+    public IRelayCommand TemplateButtonCommand => (IRelayCommand)GetValue(TemplateButtonCommandProperty);
 
     /// <summary>
     /// Lets you override the behavior of the Maximize/Restore button with an <see cref="Action"/>.
     /// </summary>
-    public Action<TitleBar, System.Windows.Window> MaximizeActionOverride { get; set; } = null!;
+    public Action<TitleBar, System.Windows.Window>? MaximizeActionOverride { get; set; }
 
     /// <summary>
     /// Lets you override the behavior of the Minimize button with an <see cref="Action"/>.
     /// </summary>
-    public Action<TitleBar, System.Windows.Window> MinimizeActionOverride { get; set; } = null!;
+    public Action<TitleBar, System.Windows.Window>? MinimizeActionOverride { get; set; }
 
-    /// <summary>
-    /// Window containing the TitleBar.
-    /// </summary>
-    internal System.Windows.Window ParentWindow => _parent ??= System.Windows.Window.GetWindow(this);
+    #endregion
+
+    private Interop.WinDef.POINT _doubleClickPoint;
+    private System.Windows.Window _currentWindow = null!;
+    private System.Windows.Controls.Grid _mainGrid = null!;
+    private readonly TitleBarButton[] _buttons = new TitleBarButton[5];
 
     /// <summary>
     /// Creates a new instance of the class and sets the default <see cref="FrameworkElement.Loaded"/> event.
@@ -382,6 +392,7 @@ public TitleBar()
         SetValue(TemplateButtonCommandProperty, new Common.RelayCommand<TitleBarButtonType>(OnTemplateButtonClick));
 
         Loaded += OnLoaded;
+        Unloaded += OnUnloaded;
     }
 
     /// <inheritdoc />
@@ -395,8 +406,27 @@ protected override void OnInitialized(EventArgs e)
 
     protected virtual void OnLoaded(object sender, RoutedEventArgs e)
     {
-        if (ParentWindow != null)
-            ParentWindow.StateChanged += OnParentWindowStateChanged;
+        if (DesignerProperties.GetIsInDesignMode(this))
+            return;
+
+        _currentWindow = System.Windows.Window.GetWindow(this) ?? throw new ArgumentNullException("Window is null");
+        _currentWindow.StateChanged += OnParentWindowStateChanged;
+
+        var handle = new WindowInteropHelper(_currentWindow).EnsureHandle();
+
+        var windowSource = HwndSource.FromHwnd(handle);
+        windowSource?.AddHook(HwndSourceHook);
+    }
+
+    private void OnUnloaded(object sender, RoutedEventArgs e)
+    {
+        Loaded -= OnLoaded;
+        Unloaded -= OnUnloaded;
+
+        Appearance.Theme.Changed -= OnThemeChanged;
+
+        _mainGrid.MouseLeftButtonDown -= OnMainGridMouseLeftButtonDown;
+        _mainGrid.MouseMove -= OnMainGridMouseMove;
     }
 
     /// <summary>
@@ -407,18 +437,21 @@ public override void OnApplyTemplate()
     {
         base.OnApplyTemplate();
 
-        var mainGrid = GetTemplateChild(ElementMainGrid) as System.Windows.Controls.Grid;
-        var maximizeButton = GetTemplateChild(ElementMaximizeButton) as TitleBarButton;
-        var restoreButton = GetTemplateChild(ElementRestoreButton) as TitleBarButton;
+        _mainGrid = GetTemplateChild<System.Windows.Controls.Grid>(ElementMainGrid);
+        _mainGrid.MouseLeftButtonDown += OnMainGridMouseLeftButtonDown;
+        _mainGrid.MouseMove += OnMainGridMouseMove;
 
-        if (mainGrid != null)
-        {
-            mainGrid.MouseLeftButtonDown += OnMainGridMouseLeftButtonDown;
-            mainGrid.MouseMove += OnMainGridMouseMove;
-        }
+        var helpButton = GetTemplateChild<TitleBarButton>(ElementHelpButton);
+        var minimizeButton = GetTemplateChild<TitleBarButton>(ElementMinimizeButton);
+        var maximizeButton = GetTemplateChild<TitleBarButton>(ElementMaximizeButton);
+        var restoreButton = GetTemplateChild<TitleBarButton>(ElementRestoreButton);
+        var closeButton = GetTemplateChild<TitleBarButton>(ElementCloseButton);
 
-        maximizeButton?.OnThemeChanged(Theme);
-        restoreButton?.OnThemeChanged(Theme);
+        _buttons[0] = restoreButton;
+        _buttons[1] = minimizeButton;
+        _buttons[2] = maximizeButton;
+        _buttons[3] = closeButton;
+        _buttons[4] = helpButton;
     }
 
     /// <summary>
@@ -426,31 +459,27 @@ public override void OnApplyTemplate()
     /// </summary>
     protected virtual void OnThemeChanged(Appearance.ThemeType currentTheme, Color systemAccent)
     {
-#if DEBUG
-        System.Diagnostics.Debug.WriteLine($"INFO | {typeof(TitleBar)} received theme -  {currentTheme}",
+        Debug.WriteLine($"INFO | {typeof(TitleBar)} received theme -  {currentTheme}",
             "Wpf.Ui.TitleBar");
-#endif
         Theme = currentTheme;
-
-        if (_snapLayout != null)
-            _snapLayout.Theme = currentTheme;
     }
 
     private void CloseWindow()
     {
-#if DEBUG
-        System.Diagnostics.Debug.WriteLine($"INFO | {typeof(TitleBar)}.CloseWindow:ForceShutdown -  {ForceShutdown}",
+        Debug.WriteLine($"INFO | {typeof(TitleBar)}.CloseWindow:ForceShutdown -  {ForceShutdown}",
             "Wpf.Ui.TitleBar");
-#endif
 
         if (ForceShutdown)
         {
             Application.Current.Shutdown();
-
             return;
         }
-        Appearance.Theme.Changed -= OnThemeChanged;
-        ParentWindow.Close();
+
+        var handle = new WindowInteropHelper(_currentWindow).EnsureHandle();
+        var windowSource = HwndSource.FromHwnd(handle);
+        windowSource?.RemoveHook(HwndSourceHook);
+
+        _currentWindow.Close();
     }
 
     private void MinimizeWindow()
@@ -460,12 +489,12 @@ private void MinimizeWindow()
 
         if (MinimizeActionOverride != null)
         {
-            MinimizeActionOverride(this, _parent);
+            MinimizeActionOverride(this, _currentWindow);
 
             return;
         }
 
-        ParentWindow.WindowState = WindowState.Minimized;
+        _currentWindow.WindowState = WindowState.Minimized;
     }
 
     private void MaximizeWindow()
@@ -475,20 +504,20 @@ private void MaximizeWindow()
 
         if (MaximizeActionOverride != null)
         {
-            MaximizeActionOverride(this, _parent);
+            MaximizeActionOverride(this, _currentWindow);
 
             return;
         }
 
-        if (ParentWindow.WindowState == WindowState.Normal)
+        if (_currentWindow.WindowState == WindowState.Normal)
         {
             IsMaximized = true;
-            ParentWindow.WindowState = WindowState.Maximized;
+            _currentWindow.WindowState = WindowState.Maximized;
         }
         else
         {
             IsMaximized = false;
-            ParentWindow.WindowState = WindowState.Normal;
+            _currentWindow.WindowState = WindowState.Normal;
         }
     }
 
@@ -499,20 +528,20 @@ private void RestoreWindow()
 
         if (MaximizeActionOverride != null)
         {
-            MaximizeActionOverride(this, _parent);
+            MaximizeActionOverride(this, _currentWindow);
 
             return;
         }
 
-        if (ParentWindow.WindowState == WindowState.Normal)
+        if (_currentWindow.WindowState == WindowState.Normal)
         {
             IsMaximized = true;
-            ParentWindow.WindowState = WindowState.Maximized;
+            _currentWindow.WindowState = WindowState.Maximized;
         }
         else
         {
             IsMaximized = false;
-            ParentWindow.WindowState = WindowState.Normal;
+            _currentWindow.WindowState = WindowState.Normal;
         }
     }
 
@@ -521,19 +550,19 @@ private bool MinimizeWindowToTray()
         if (!Tray.IsRegistered)
             return false;
 
-        ParentWindow.WindowState = WindowState.Minimized;
-        ParentWindow.Hide();
+        _currentWindow.WindowState = WindowState.Minimized;
+        _currentWindow.Hide();
 
         return true;
     }
 
     private void OnMainGridMouseMove(object sender, MouseEventArgs e)
     {
-        if (e.LeftButton != MouseButtonState.Pressed || ParentWindow == null)
+        if (e.LeftButton != MouseButtonState.Pressed)
             return;
 
         // prevent firing from double clicking when the mouse never actually moved
-        Interop.User32.GetCursorPos(out var currentMousePos);
+        User32.GetCursorPos(out var currentMousePos);
 
         if (currentMousePos.x == _doubleClickPoint.x && currentMousePos.y == _doubleClickPoint.y)
             return;
@@ -552,29 +581,26 @@ private void OnMainGridMouseMove(object sender, MouseEventArgs e)
             //   how the OS operates.
             // - It should be set as a % (e.g. screen X / maximized width),
             //   then offset from the left to line up more naturally.
-            ParentWindow.Left = screenPoint.X - (ParentWindow.RestoreBounds.Width * 0.5);
-            ParentWindow.Top = screenPoint.Y;
+            _currentWindow.Left = screenPoint.X - (_currentWindow.RestoreBounds.Width * 0.5);
+            _currentWindow.Top = screenPoint.Y;
 
             // style has to be quickly swapped to avoid restore animation delay
-            var style = ParentWindow.WindowStyle;
-            ParentWindow.WindowStyle = WindowStyle.None;
-            ParentWindow.WindowState = WindowState.Normal;
-            ParentWindow.WindowStyle = style;
+            var style = _currentWindow.WindowStyle;
+            _currentWindow.WindowStyle = WindowStyle.None;
+            _currentWindow.WindowState = WindowState.Normal;
+            _currentWindow.WindowStyle = style;
         }
 
         // Call drag move only when mouse down, check again
         // if()
         if (e.LeftButton == MouseButtonState.Pressed)
-            ParentWindow.DragMove();
+            _currentWindow.DragMove();
     }
 
     private void OnParentWindowStateChanged(object sender, EventArgs e)
     {
-        if (ParentWindow == null)
-            return;
-
-        if (IsMaximized != (ParentWindow.WindowState == WindowState.Maximized))
-            IsMaximized = ParentWindow.WindowState == WindowState.Maximized;
+        if (IsMaximized != (_currentWindow.WindowState == WindowState.Maximized))
+            IsMaximized = _currentWindow.WindowState == WindowState.Maximized;
     }
 
     private void OnMainGridMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
@@ -616,4 +642,43 @@ private void OnTemplateButtonClick(TitleBarButtonType buttonType)
                 break;
         }
     }
+
+    private IntPtr HwndSourceHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+    {
+        var message = (User32.WM)msg;
+
+        foreach (var button in _buttons)
+        {
+            if (!button.ReactToHwndHook(message, lParam, out var returnIntPtr))
+                continue;
+
+            //It happens that the background is not removed from the buttons and you can make all the buttons are in the IsHovered position
+            //It cleans up
+            foreach (var anotherButton in _buttons)
+            {
+                if (anotherButton == button)
+                    continue;
+
+                if (anotherButton.IsHovered && button.IsHovered)
+                {
+                    anotherButton.RemoveHover();
+                }
+            }
+
+            handled = true;
+            return returnIntPtr;
+        }
+
+        return IntPtr.Zero;
+    }
+
+    private T GetTemplateChild<T>(string name) where T : DependencyObject
+    {
+        var element = base.GetTemplateChild(name);
+
+        if (element is null)
+            throw new ArgumentNullException($"{name} is null");
+
+        return (T)element;
+    }
 }
diff --git a/src/Wpf.Ui/Controls/TitleBarButton.cs b/src/Wpf.Ui/Controls/TitleBarButton.cs
index 35f0f2b4e..0b74cdd24 100644
--- a/src/Wpf.Ui/Controls/TitleBarButton.cs
+++ b/src/Wpf.Ui/Controls/TitleBarButton.cs
@@ -53,48 +53,36 @@ public Brush ButtonsForeground
         (byte)0xFF,
         (byte)0xFF));*/
 
-    private HwndSource? _hwndSource;
     private User32.WM_NCHITTEST _returnValue;
     private Brush _defaultBackgroundBrush = null!;
 
     private bool _isClickedDown;
 
-    public TitleBarButton()
+    protected override void OnInitialized(EventArgs e)
     {
-        Loaded += (_, _) =>
-        {
-            _defaultBackgroundBrush = Background;
-
-            if (ButtonType == TitleBarButtonType.Unknown)
-                return;
+        base.OnInitialized(e);
 
-            _hwndSource = PresentationSource.FromVisual(this) as HwndSource ??
-                          throw new ArgumentNullException($"HwndSource is null");
+        _defaultBackgroundBrush = Background;
 
-            _hwndSource.AddHook(Hook);
+        if (ButtonType == TitleBarButtonType.Unknown)
+            return;
 
-            _returnValue = ButtonType switch
-            {
-                TitleBarButtonType.Help => User32.WM_NCHITTEST.HTHELP,
-                TitleBarButtonType.Minimize => User32.WM_NCHITTEST.HTMINBUTTON,
-                TitleBarButtonType.Close => User32.WM_NCHITTEST.HTCLOSE,
-                TitleBarButtonType.Restore => User32.WM_NCHITTEST.HTMAXBUTTON,
-                TitleBarButtonType.Maximize => User32.WM_NCHITTEST.HTMAXBUTTON,
-                _ => throw new ArgumentOutOfRangeException()
-            };
+        _returnValue = ButtonType switch
+        {
+            TitleBarButtonType.Help => User32.WM_NCHITTEST.HTHELP,
+            TitleBarButtonType.Minimize => User32.WM_NCHITTEST.HTMINBUTTON,
+            TitleBarButtonType.Close => User32.WM_NCHITTEST.HTCLOSE,
+            TitleBarButtonType.Restore => User32.WM_NCHITTEST.HTMAXBUTTON,
+            TitleBarButtonType.Maximize => User32.WM_NCHITTEST.HTMAXBUTTON,
+            _ => throw new ArgumentOutOfRangeException()
         };
-
-        Unloaded += (_, _) => _hwndSource?.RemoveHook(Hook);
     }
 
-    public void OnThemeChanged(ThemeType themeType)
+    internal bool ReactToHwndHook(User32.WM msg, IntPtr lParam, out IntPtr returnIntPtr)
     {
-        /*_hoverBrush = themeType == ThemeType.Light ? _hoverColorLight : _hoverColorDark;*/
-    }
+        returnIntPtr = IntPtr.Zero;
 
-    private IntPtr Hook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
-    {
-        switch ((User32.WM)msg)
+        switch (msg)
         {
             case User32.WM.MOVE:
                 // Adjust [Size] of the buttons if the DPI is changed
@@ -105,8 +93,9 @@ private IntPtr Hook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool
                 if (IsMouseOverElement(lParam))
                 {
                     Hover();
-                    handled = true;
-                    return (IntPtr)_returnValue;
+
+                    returnIntPtr = (IntPtr)_returnValue;
+                    return true;
                 }
 
                 RemoveHover();
@@ -122,7 +111,7 @@ private IntPtr Hook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool
                 if (IsMouseOverElement(lParam))
                 {
                     _isClickedDown = true;
-                    handled = true;
+                    return true;
                 }
                 break;
 
@@ -131,12 +120,12 @@ private IntPtr Hook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool
                 if (_isClickedDown && IsMouseOverElement(lParam))
                 {
                     InvokeClick();
-                    handled = true;
+                    return true;
                 }
                 break;
         }
 
-        return IntPtr.Zero;
+        return false;
     }
 
     /// <summary>
diff --git a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
index 6fcc69108..1006aab36 100644
--- a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
+++ b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
@@ -176,11 +176,11 @@
                                 </Grid.ColumnDefinitions>
 
                                 <controls:TitleBarButton
-                                    x:Name="ButtonHelp"
+                                    x:Name="PART_HelpButton"
                                     Grid.Column="0"
                                     ButtonType="Help" />
                                 <controls:TitleBarButton
-                                    x:Name="ButtonMinimize"
+                                    x:Name="PART_MinimizeButton"
                                     Grid.Column="1"
                                     ButtonType="Minimize" />
                                 <controls:TitleBarButton
@@ -193,8 +193,6 @@
                                     Width="0"
                                     Height="0"
                                     ButtonType="Restore"
-                                    IsEnabled="False"
-                                    IsHitTestVisible="False"
                                     Visibility="Collapsed" />
 
                                 <controls:TitleBarButton
@@ -220,6 +218,8 @@
                                 <Condition Property="IsMaximized" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_RestoreButton" Property="Width" Value="44" />
+                            <Setter TargetName="PART_RestoreButton" Property="Height" Value="30" />
                         </MultiTrigger>
                         <Trigger Property="Theme" Value="Dark">
                             <Setter Property="ButtonsBackground">
@@ -236,13 +236,13 @@
                             <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                         <Trigger Property="ShowMinimize" Value="False">
-                            <Setter TargetName="ButtonMinimize" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_MinimizeButton" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                         <Trigger Property="ShowMaximize" Value="False">
                             <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                         <Trigger Property="ShowHelp" Value="False">
-                            <Setter TargetName="ButtonHelp" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_HelpButton" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                         <Trigger Property="ShowClose" Value="True">
                             <Setter TargetName="PART_CloseButton" Property="Visibility" Value="Visible" />

From e035a1c9ad888a8108dfcda85fae79bee14a939f Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sun, 22 Jan 2023 18:35:30 +0600
Subject: [PATCH 3/8] clean up

---
 src/Wpf.Ui/Controls/TitleBar.cs              | 19 +++++--
 src/Wpf.Ui/Controls/TitleBarButton.cs        | 52 ++------------------
 src/Wpf.Ui/Extensions/UiElementExtensions.cs | 33 +++++++++++++
 src/Wpf.Ui/Styles/Controls/TitleBar.xaml     |  4 --
 4 files changed, 53 insertions(+), 55 deletions(-)
 create mode 100644 src/Wpf.Ui/Extensions/UiElementExtensions.cs

diff --git a/src/Wpf.Ui/Controls/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBar.cs
index 1b8939340..416fe9682 100644
--- a/src/Wpf.Ui/Controls/TitleBar.cs
+++ b/src/Wpf.Ui/Controls/TitleBar.cs
@@ -12,6 +12,7 @@
 using System.Windows.Media;
 using Wpf.Ui.Common;
 using Wpf.Ui.Dpi;
+using Wpf.Ui.Extensions;
 using Wpf.Ui.Interop;
 using Wpf.Ui.TitleBar;
 
@@ -461,6 +462,7 @@ protected virtual void OnThemeChanged(Appearance.ThemeType currentTheme, Color s
     {
         Debug.WriteLine($"INFO | {typeof(TitleBar)} received theme -  {currentTheme}",
             "Wpf.Ui.TitleBar");
+
         Theme = currentTheme;
     }
 
@@ -487,7 +489,7 @@ private void MinimizeWindow()
         if (MinimizeToTray && Tray.IsRegistered && MinimizeWindowToTray())
             return;
 
-        if (MinimizeActionOverride != null)
+        if (MinimizeActionOverride is not null)
         {
             MinimizeActionOverride(this, _currentWindow);
 
@@ -502,7 +504,7 @@ private void MaximizeWindow()
         if (!CanMaximize)
             return;
 
-        if (MaximizeActionOverride != null)
+        if (MaximizeActionOverride is not null)
         {
             MaximizeActionOverride(this, _currentWindow);
 
@@ -526,7 +528,7 @@ private void RestoreWindow()
         if (!CanMaximize)
             return;
 
-        if (MaximizeActionOverride != null)
+        if (MaximizeActionOverride is not null)
         {
             MaximizeActionOverride(this, _currentWindow);
 
@@ -669,6 +671,17 @@ private IntPtr HwndSourceHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam
             return returnIntPtr;
         }
 
+        switch (message)
+        {
+            case User32.WM.NCHITTEST:
+                if (this.IsMouseOverElement(lParam))
+                {
+                    handled = true;
+                    return (IntPtr)User32.WM_NCHITTEST.HTCAPTION;
+                }
+                break;
+        }
+
         return IntPtr.Zero;
     }
 
diff --git a/src/Wpf.Ui/Controls/TitleBarButton.cs b/src/Wpf.Ui/Controls/TitleBarButton.cs
index 0b74cdd24..44a4f36fa 100644
--- a/src/Wpf.Ui/Controls/TitleBarButton.cs
+++ b/src/Wpf.Ui/Controls/TitleBarButton.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Diagnostics;
 using System.Windows;
 using System.Windows.Automation.Peers;
 using System.Windows.Automation.Provider;
-using System.Windows.Interop;
 using System.Windows.Media;
-using Wpf.Ui.Appearance;
+using Wpf.Ui.Extensions;
 using Wpf.Ui.Interop;
 using Wpf.Ui.TitleBar;
 
@@ -41,18 +39,6 @@ public Brush ButtonsForeground
 
     public bool IsHovered { get; private set; }
 
-    /*private static SolidColorBrush _hoverColorLight = new SolidColorBrush(Color.FromArgb(
-        (byte)0x1A,
-        (byte)0x00,
-        (byte)0x00,
-        (byte)0x00));
-
-    private static SolidColorBrush _hoverColorDark = new SolidColorBrush(Color.FromArgb(
-        (byte)0x17,
-        (byte)0xFF,
-        (byte)0xFF,
-        (byte)0xFF));*/
-
     private User32.WM_NCHITTEST _returnValue;
     private Brush _defaultBackgroundBrush = null!;
 
@@ -84,13 +70,9 @@ internal bool ReactToHwndHook(User32.WM msg, IntPtr lParam, out IntPtr returnInt
 
         switch (msg)
         {
-            case User32.WM.MOVE:
-                // Adjust [Size] of the buttons if the DPI is changed
-                break;
-
             // Hit test, for determining whether the mouse cursor is over one of the buttons
             case User32.WM.NCHITTEST:
-                if (IsMouseOverElement(lParam))
+                if (this.IsMouseOverElement(lParam))
                 {
                     Hover();
 
@@ -108,7 +90,7 @@ internal bool ReactToHwndHook(User32.WM msg, IntPtr lParam, out IntPtr returnInt
 
             // Left button clicked down
             case User32.WM.NCLBUTTONDOWN:
-                if (IsMouseOverElement(lParam))
+                if (this.IsMouseOverElement(lParam))
                 {
                     _isClickedDown = true;
                     return true;
@@ -117,7 +99,7 @@ internal bool ReactToHwndHook(User32.WM msg, IntPtr lParam, out IntPtr returnInt
 
             // Left button clicked up
             case User32.WM.NCLBUTTONUP:
-                if (_isClickedDown && IsMouseOverElement(lParam))
+                if (_isClickedDown && this.IsMouseOverElement(lParam))
                 {
                     InvokeClick();
                     return true;
@@ -128,22 +110,6 @@ internal bool ReactToHwndHook(User32.WM msg, IntPtr lParam, out IntPtr returnInt
         return false;
     }
 
-    /// <summary>
-    /// Do not call it outside of NCHITTEST message!
-    /// </summary>
-    private bool IsMouseOverElement(IntPtr lParam)
-    {
-        // This method will be invoked very often and must be as simple as possible.
-
-        if (lParam == IntPtr.Zero)
-            return false;
-
-        var mousePosScreen = new Point(Get_X_LParam(lParam), Get_Y_LParam(lParam));
-        var bounds = new Rect(new Point(), RenderSize);
-        var mousePosRelative = PointFromScreen(mousePosScreen);
-        return bounds.Contains(mousePosRelative);
-    }
-
     /// <summary>
     /// Invokes click on the button.
     /// </summary>
@@ -180,14 +146,4 @@ public void RemoveHover()
         IsHovered = false;
         _isClickedDown = false;
     }
-
-    private static int Get_X_LParam(IntPtr lParam)
-    {
-        return (short)(lParam.ToInt32() & 0xFFFF);
-    }
-
-    private static int Get_Y_LParam(IntPtr lParam)
-    {
-        return (short)(lParam.ToInt32() >> 16);
-    }
 }
diff --git a/src/Wpf.Ui/Extensions/UiElementExtensions.cs b/src/Wpf.Ui/Extensions/UiElementExtensions.cs
new file mode 100644
index 000000000..97e5fca0d
--- /dev/null
+++ b/src/Wpf.Ui/Extensions/UiElementExtensions.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Windows;
+
+namespace Wpf.Ui.Extensions;
+
+public static class UiElementExtensions
+{
+    /// <summary>
+    /// Do not call it outside of NCHITTEST, NCLBUTTONUP, NCLBUTTONDOWN messages!
+    /// </summary>
+    public static bool IsMouseOverElement(this UIElement element, IntPtr lParam)
+    {
+        // This method will be invoked very often and must be as simple as possible.
+
+        if (lParam == IntPtr.Zero)
+            return false;
+
+        var mousePosScreen = new Point(Get_X_LParam(lParam), Get_Y_LParam(lParam));
+        var bounds = new Rect(new Point(), element.RenderSize);
+        var mousePosRelative = element.PointFromScreen(mousePosScreen);
+        return bounds.Contains(mousePosRelative);
+    }
+
+    private static int Get_X_LParam(IntPtr lParam)
+    {
+        return (short)(lParam.ToInt32() & 0xFFFF);
+    }
+
+    private static int Get_Y_LParam(IntPtr lParam)
+    {
+        return (short)(lParam.ToInt32() >> 16);
+    }
+}
diff --git a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
index 1006aab36..765958272 100644
--- a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
+++ b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
@@ -190,8 +190,6 @@
                                 <controls:TitleBarButton
                                     x:Name="PART_RestoreButton"
                                     Grid.Column="3"
-                                    Width="0"
-                                    Height="0"
                                     ButtonType="Restore"
                                     Visibility="Collapsed" />
 
@@ -218,8 +216,6 @@
                                 <Condition Property="IsMaximized" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="PART_RestoreButton" Property="Width" Value="44" />
-                            <Setter TargetName="PART_RestoreButton" Property="Height" Value="30" />
                         </MultiTrigger>
                         <Trigger Property="Theme" Value="Dark">
                             <Setter Property="ButtonsBackground">

From 7e7b824732837cf2a0e463319ef0a15db885e7ee Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Sun, 22 Jan 2023 18:40:25 +0600
Subject: [PATCH 4/8] deleted SnapLayout  and SnapLayoutButton

---
 src/Wpf.Ui/Controls/TitleBar.cs         |  20 +--
 src/Wpf.Ui/TitleBar/SnapLayout.cs       | 203 ------------------------
 src/Wpf.Ui/TitleBar/SnapLayoutButton.cs | 179 ---------------------
 3 files changed, 2 insertions(+), 400 deletions(-)
 delete mode 100644 src/Wpf.Ui/TitleBar/SnapLayout.cs
 delete mode 100644 src/Wpf.Ui/TitleBar/SnapLayoutButton.cs

diff --git a/src/Wpf.Ui/Controls/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBar.cs
index 416fe9682..7f114e116 100644
--- a/src/Wpf.Ui/Controls/TitleBar.cs
+++ b/src/Wpf.Ui/Controls/TitleBar.cs
@@ -79,13 +79,6 @@ public class TitleBar : System.Windows.Controls.Control, IThemeControl
         nameof(MinimizeToTray),
         typeof(bool), typeof(TitleBar), new PropertyMetadata(false));
 
-    /// <summary>
-    /// Property for <see cref="UseSnapLayout"/>.
-    /// </summary>
-    public static readonly DependencyProperty UseSnapLayoutProperty = DependencyProperty.Register(
-        nameof(UseSnapLayout),
-        typeof(bool), typeof(TitleBar), new PropertyMetadata(false));
-
     /// <summary>
     /// Property for <see cref="IsMaximized"/>.
     /// </summary>
@@ -237,15 +230,6 @@ public bool MinimizeToTray
         set => SetValue(MinimizeToTrayProperty, value);
     }
 
-    /// <summary>
-    /// Gets or sets information whether the use Windows 11 Snap Layout.
-    /// </summary>
-    public bool UseSnapLayout
-    {
-        get => (bool)GetValue(UseSnapLayoutProperty);
-        set => SetValue(UseSnapLayoutProperty, value);
-    }
-
     /// <summary>
     /// Gets or sets information whether the current window is maximized.
     /// </summary>
@@ -450,8 +434,8 @@ public override void OnApplyTemplate()
 
         _buttons[0] = restoreButton;
         _buttons[1] = minimizeButton;
-        _buttons[2] = maximizeButton;
-        _buttons[3] = closeButton;
+        _buttons[2] = closeButton;
+        _buttons[3] = maximizeButton;
         _buttons[4] = helpButton;
     }
 
diff --git a/src/Wpf.Ui/TitleBar/SnapLayout.cs b/src/Wpf.Ui/TitleBar/SnapLayout.cs
deleted file mode 100644
index be923a8a3..000000000
--- a/src/Wpf.Ui/TitleBar/SnapLayout.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
-// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
-// All Rights Reserved.
-
-using System;
-using System.Windows;
-using System.Windows.Interop;
-using System.Windows.Media;
-using Wpf.Ui.Appearance;
-using Wpf.Ui.Controls;
-using Wpf.Ui.Dpi;
-
-namespace Wpf.Ui.TitleBar;
-
-/// <summary>
-/// Brings the Snap Layout functionality from Windows 11 to a custom <see cref="Controls.TitleBar"/>.
-/// </summary>
-internal sealed class SnapLayout : IThemeControl
-{
-    private readonly SnapLayoutButton _maximizeButton;
-
-    private readonly SnapLayoutButton _restoreButton;
-
-    /// <summary>
-    /// Currently used theme.
-    /// </summary>
-    private ThemeType _currentTheme;
-
-    /// <summary>
-    /// Currently active hover color.
-    /// </summary>
-    private SolidColorBrush _currentHoverColor = Brushes.Transparent;
-
-    /// <summary>
-    /// Current theme.
-    /// </summary>
-    public ThemeType Theme
-    {
-        get => _currentTheme;
-        set
-        {
-            _currentHoverColor = value == ThemeType.Light ? HoverColorLight : HoverColorDark;
-            _currentTheme = value;
-        }
-    }
-
-    /// <summary>
-    /// Default background.
-    /// </summary>
-    public SolidColorBrush DefaultButtonBackground { get; set; } = Brushes.Transparent;
-
-    /// <summary>
-    /// Hover background when light theme.
-    /// </summary>
-    public SolidColorBrush HoverColorLight = Brushes.Transparent;
-
-    /// <summary>
-    /// Hover background when dark theme.
-    /// </summary>
-    public SolidColorBrush HoverColorDark = Brushes.Transparent;
-
-    /// <summary>
-    /// Creates new instance.
-    /// </summary>
-    private SnapLayout(Window window, Wpf.Ui.Controls.Button maximizeButton, Wpf.Ui.Controls.Button restoreButton)
-    {
-        if (window == null)
-            return;
-
-        var windowHandle = new WindowInteropHelper(window).Handle;
-
-        if (windowHandle == IntPtr.Zero)
-            return;
-
-        var windowDpi = DpiHelper.GetWindowDpi(windowHandle);
-
-        _maximizeButton = new SnapLayoutButton(maximizeButton, TitleBarButton.Maximize, windowDpi.DpiScaleX);
-        _restoreButton = new SnapLayoutButton(restoreButton, TitleBarButton.Restore, windowDpi.DpiScaleX);
-
-        HwndSource hwnd = (HwndSource)PresentationSource.FromVisual(maximizeButton);
-
-        if (hwnd != null)
-            hwnd.AddHook(HwndSourceHook);
-
-        //var windowSource = HwndSource.FromHwnd(windowHandle);
-
-        //if (windowSource != null)
-        //    windowSource.AddHook(HwndSourceHook);
-    }
-
-    /// <summary>
-    /// Determines whether the snap layout is supported.
-    /// </summary>
-    public static bool IsSupported()
-    {
-        return Win32.Utilities.IsOSWindows11OrNewer;
-    }
-
-    /// <summary>
-    /// Registers the snap layout for provided buttons and window.
-    /// </summary>
-    public static SnapLayout Register(Window window, Wpf.Ui.Controls.Button maximizeButton, Wpf.Ui.Controls.Button restoreButton)
-    {
-        return new SnapLayout(window, maximizeButton, restoreButton);
-    }
-
-    /// <summary>
-    /// Represents the method that handles Win32 window messages.
-    /// </summary>
-    /// <param name="hWnd">The window handle.</param>
-    /// <param name="uMsg">The message ID.</param>
-    /// <param name="wParam">The message's wParam value.</param>
-    /// <param name="lParam">The message's lParam value.</param>
-    /// <param name="handled">A value that indicates whether the message was handled. Set the value to <see langword="true"/> if the message was handled; otherwise, <see langword="false"/>.</param>
-    /// <returns>The appropriate return value depends on the particular message. See the message documentation details for the Win32 message being handled.</returns>
-    private IntPtr HwndSourceHook(IntPtr hWnd, int uMsg, IntPtr wParam, IntPtr lParam, ref bool handled)
-    {
-        var mouseNotification = (Interop.User32.WM)uMsg;
-
-        System.Diagnostics.Debug.WriteLine($"INFO | MESSAGE: {mouseNotification}, OVER MAX: {_maximizeButton.IsMouseOver(lParam)}, OVER REST: {_restoreButton.IsMouseOver(lParam)}");
-
-        switch (mouseNotification)
-        {
-            case Interop.User32.WM.MOVE:
-                // Adjust [Size] of the buttons if the DPI is changed
-                break;
-
-            // Mouse leaves the window
-            case Interop.User32.WM.NCMOUSELEAVE:
-                _maximizeButton.RemoveHover(DefaultButtonBackground);
-                _restoreButton.RemoveHover(DefaultButtonBackground);
-
-                break;
-
-            // Left button clicked down
-            case Interop.User32.WM.NCLBUTTONDOWN:
-                if (_maximizeButton.IsMouseOver(lParam))
-                {
-                    _maximizeButton.IsClickedDown = true;
-
-                    handled = true;
-                }
-
-                if (_restoreButton.IsMouseOver(lParam))
-                {
-                    _restoreButton.IsClickedDown = true;
-
-                    handled = true;
-                }
-
-                break;
-
-            // Left button clicked up
-            case Interop.User32.WM.NCLBUTTONUP:
-                if (_maximizeButton.IsClickedDown && _maximizeButton.IsMouseOver(lParam))
-                {
-                    _maximizeButton.InvokeClick();
-
-                    handled = true;
-
-                    break;
-                }
-
-                if (_restoreButton.IsClickedDown && _restoreButton.IsMouseOver(lParam))
-                {
-                    _restoreButton.InvokeClick();
-
-                    handled = true;
-                }
-
-                break;
-
-            // Hit test, for determining whether the mouse cursor is over one of the buttons
-            case Interop.User32.WM.NCHITTEST:
-                if (_maximizeButton.IsMouseOver(lParam))
-                {
-                    _maximizeButton.Hover(_currentHoverColor);
-
-                    handled = true;
-
-                    return new IntPtr((int)Interop.User32.WM_NCHITTEST.HTMAXBUTTON);
-                }
-
-                _maximizeButton.RemoveHover(DefaultButtonBackground);
-
-                if (_restoreButton.IsMouseOver(lParam))
-                {
-                    _restoreButton.Hover(_currentHoverColor);
-
-                    handled = true;
-
-                    return new IntPtr((int)Interop.User32.WM_NCHITTEST.HTMAXBUTTON);
-                }
-
-                _restoreButton.RemoveHover(DefaultButtonBackground);
-
-                return IntPtr.Zero;
-        }
-
-        return IntPtr.Zero;
-    }
-}
diff --git a/src/Wpf.Ui/TitleBar/SnapLayoutButton.cs b/src/Wpf.Ui/TitleBar/SnapLayoutButton.cs
deleted file mode 100644
index f0d522a2c..000000000
--- a/src/Wpf.Ui/TitleBar/SnapLayoutButton.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
-// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
-// All Rights Reserved.
-
-using System;
-using System.Windows;
-using System.Windows.Automation.Peers;
-using System.Windows.Automation.Provider;
-using System.Windows.Media;
-
-namespace Wpf.Ui.TitleBar;
-
-/// <summary>
-/// Represents a snap layout button.
-/// </summary>
-internal class SnapLayoutButton
-{
-    /// <summary>
-    /// Visual controls of the button.
-    /// </summary>
-    private readonly Wpf.Ui.Controls.Button _visual;
-
-    /// <summary>
-    /// Type of the button.
-    /// </summary>
-    public readonly TitleBarButton Type;
-
-    /// <summary>
-    /// Rendered size of the button control.
-    /// </summary>
-    private Size _renderedSize;
-
-    /// <summary>
-    /// Width - Default is 0, must be non-negative
-    /// </summary>
-    public double Width => _renderedSize.Width;
-
-    /// <summary>
-    /// Height - Default is 0, must be non-negative
-    /// </summary>
-    public double Height => _renderedSize.Height;
-
-    /// <summary>
-    /// Whether the button is clicked.
-    /// </summary>
-    public bool IsClickedDown { get; set; }
-
-    /// <summary>
-    /// Whether the mouse is over the button.
-    /// </summary>
-    public bool IsHovered { get; private set; }
-
-    /// <summary>
-    /// Creates new instance and sets internals.
-    /// </summary>
-    public SnapLayoutButton(Wpf.Ui.Controls.Button button, TitleBarButton type, double dpiScale)
-    {
-        _visual = button ?? throw new InvalidOperationException($"Parameter button of the {typeof(SnapLayoutButton)} cannot be null.");
-
-        // TODO: If application is DPI aware, the scale can vary depends on the screen
-        // Should also react to DPI change and adjust the Size
-
-        if (button.IsLoaded)
-            UpdateScale(dpiScale);
-        else
-            button.Loaded += (_, _) => UpdateScale(dpiScale);
-
-        Type = type;
-        IsHovered = false;
-        IsClickedDown = false;
-    }
-
-    public void UpdateScale(double dpiScale)
-    {
-        // If the screen is scaled, the pixels/dots do not reflect the rendered size
-        var renderedWidth = _visual.ActualWidth * dpiScale;
-        var renderedHeight = _visual.ActualHeight * dpiScale;
-
-        // Well, the one pixel button is probably not correct
-        if (renderedWidth < 1 || renderedHeight < 1)
-            _renderedSize = new Size(0d, 0d);
-        else
-            _renderedSize = new Size(renderedWidth, renderedHeight);
-    }
-
-    /// <summary>
-    /// Invokes click on the button.
-    /// </summary>
-    public void InvokeClick()
-    {
-        if (new ButtonAutomationPeer(_visual).GetPattern(PatternInterface.Invoke) is IInvokeProvider invokeProvider)
-            invokeProvider.Invoke();
-
-        IsClickedDown = false;
-    }
-
-    /// <summary>
-    /// Forces button background to change.
-    /// </summary>
-    public void Hover(SolidColorBrush hoverBrush)
-    {
-        if (IsHovered)
-            return;
-
-        _visual.Background = hoverBrush;
-        IsHovered = true;
-    }
-
-    /// <summary>
-    /// Forces button background to change.
-    /// </summary>
-    public void RemoveHover(SolidColorBrush regularBrush)
-    {
-        if (!IsHovered)
-            return;
-
-        _visual.Background = regularBrush;
-
-        IsHovered = false;
-        IsClickedDown = false;
-    }
-
-    /// <summary>
-    /// Indicates whether the mouse is over the button.
-    /// </summary>
-    public bool IsMouseOver(IntPtr positionPointer)
-    {
-        // This method will be invoked very often and must be as simple as possible.
-
-        // Pointer carries no data
-        if (positionPointer == IntPtr.Zero)
-            return false;
-
-        // Invalid button size
-        if (_renderedSize.Height == 0 && _renderedSize.Width == 0)
-            return false;
-
-        var positionPointerLong = positionPointer.ToInt64();
-
-        if (positionPointerLong > 2147483647 || positionPointerLong < -2145629296)
-            return false;
-
-        var positionWords = (int)positionPointerLong;
-
-        if (positionWords < 1)
-            return false;
-
-        // The low-order word specifies the x-coordinate of the cursor.The coordinate is relative to the upper-left corner of the screen.
-        var positionX = positionWords & 0xffff;
-        // The high-order word specifies the y-coordinate of the cursor.The coordinate is relative to the upper-left corner of the screen.
-        var positionY = positionWords >> 0x0010;
-
-        // The screen has no negative positions
-        if (positionX < 0 || positionY < 0)
-            return false;
-
-        // Button area on screen
-        Rect rect;
-
-        try
-        {
-            // Can throw exception during translation
-            rect = new Rect(
-                _visual.PointToScreen(new Point()),
-                _renderedSize);
-        }
-        catch (Exception e)
-        {
-#if DEBUG
-            System.Diagnostics.Debug.WriteLine($"ERROR | {e}", "Wpf.Ui.SnapLayout");
-#endif
-            return false; // or not to false, that is the question
-        }
-
-        // Whether the cursor is inside the button area
-        return rect.Contains(new Point(positionX, positionY));
-    }
-}

From 356e73189690ff86e602b15a868a4cea9666c85b Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Mon, 23 Jan 2023 12:51:52 +0600
Subject: [PATCH 5/8] deleted restore button

---
 src/Wpf.Ui/Controls/TitleBar.cs          | 16 ++--
 src/Wpf.Ui/Controls/TitleBarButton.cs    | 94 ++++++++++++------------
 src/Wpf.Ui/Styles/Controls/TitleBar.xaml | 48 ++++++------
 3 files changed, 80 insertions(+), 78 deletions(-)

diff --git a/src/Wpf.Ui/Controls/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBar.cs
index 7f114e116..29cf4f5c4 100644
--- a/src/Wpf.Ui/Controls/TitleBar.cs
+++ b/src/Wpf.Ui/Controls/TitleBar.cs
@@ -367,7 +367,7 @@ public event RoutedEventHandler HelpClicked
     private Interop.WinDef.POINT _doubleClickPoint;
     private System.Windows.Window _currentWindow = null!;
     private System.Windows.Controls.Grid _mainGrid = null!;
-    private readonly TitleBarButton[] _buttons = new TitleBarButton[5];
+    private readonly TitleBarButton[] _buttons = new TitleBarButton[4];
 
     /// <summary>
     /// Creates a new instance of the class and sets the default <see cref="FrameworkElement.Loaded"/> event.
@@ -399,8 +399,8 @@ protected virtual void OnLoaded(object sender, RoutedEventArgs e)
 
         var handle = new WindowInteropHelper(_currentWindow).EnsureHandle();
 
-        var windowSource = HwndSource.FromHwnd(handle);
-        windowSource?.AddHook(HwndSourceHook);
+        var windowSource = HwndSource.FromHwnd(handle) ?? throw new ArgumentNullException("Window source is null");
+        windowSource.AddHook(HwndSourceHook);
     }
 
     private void OnUnloaded(object sender, RoutedEventArgs e)
@@ -429,14 +429,12 @@ public override void OnApplyTemplate()
         var helpButton = GetTemplateChild<TitleBarButton>(ElementHelpButton);
         var minimizeButton = GetTemplateChild<TitleBarButton>(ElementMinimizeButton);
         var maximizeButton = GetTemplateChild<TitleBarButton>(ElementMaximizeButton);
-        var restoreButton = GetTemplateChild<TitleBarButton>(ElementRestoreButton);
         var closeButton = GetTemplateChild<TitleBarButton>(ElementCloseButton);
 
-        _buttons[0] = restoreButton;
+        _buttons[0] = maximizeButton;
         _buttons[1] = minimizeButton;
         _buttons[2] = closeButton;
-        _buttons[3] = maximizeButton;
-        _buttons[4] = helpButton;
+        _buttons[3] = helpButton;
     }
 
     /// <summary>
@@ -633,6 +631,9 @@ private IntPtr HwndSourceHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam
     {
         var message = (User32.WM)msg;
 
+        if (message is not (User32.WM.NCHITTEST or User32.WM.NCMOUSELEAVE or User32.WM.NCLBUTTONDOWN or User32.WM.NCLBUTTONUP))
+            return IntPtr.Zero;
+
         foreach (var button in _buttons)
         {
             if (!button.ReactToHwndHook(message, lParam, out var returnIntPtr))
@@ -663,6 +664,7 @@ private IntPtr HwndSourceHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam
                     handled = true;
                     return (IntPtr)User32.WM_NCHITTEST.HTCAPTION;
                 }
+
                 break;
         }
 
diff --git a/src/Wpf.Ui/Controls/TitleBarButton.cs b/src/Wpf.Ui/Controls/TitleBarButton.cs
index 44a4f36fa..b932e415e 100644
--- a/src/Wpf.Ui/Controls/TitleBarButton.cs
+++ b/src/Wpf.Ui/Controls/TitleBarButton.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Windows;
 using System.Windows.Automation.Peers;
 using System.Windows.Automation.Provider;
@@ -12,7 +13,7 @@ namespace Wpf.Ui.Controls;
 public class TitleBarButton : Wpf.Ui.Controls.Button
 {
     public static readonly DependencyProperty ButtonTypeProperty = DependencyProperty.Register(nameof(ButtonType),
-        typeof(TitleBarButtonType), typeof(TitleBarButton), new PropertyMetadata(TitleBarButtonType.Unknown));
+        typeof(TitleBarButtonType), typeof(TitleBarButton), new PropertyMetadata(TitleBarButtonType.Unknown, ButtonTypePropertyCallback));
 
     /// <summary>
     /// Property for <see cref="ButtonsForeground"/>.
@@ -40,28 +41,45 @@ public Brush ButtonsForeground
     public bool IsHovered { get; private set; }
 
     private User32.WM_NCHITTEST _returnValue;
-    private Brush _defaultBackgroundBrush = null!;
+    private Brush _defaultBackgroundBrush = Brushes.Transparent; //Should it be transparent?
 
     private bool _isClickedDown;
 
-    protected override void OnInitialized(EventArgs e)
+    /// <summary>
+    /// Forces button background to change.
+    /// </summary>
+    public void Hover()
     {
-        base.OnInitialized(e);
+        if (IsHovered)
+            return;
 
-        _defaultBackgroundBrush = Background;
+        Background = MouseOverBackground;
+        IsHovered = true;
+    }
 
-        if (ButtonType == TitleBarButtonType.Unknown)
+    /// <summary>
+    /// Forces button background to change.
+    /// </summary>
+    public void RemoveHover()
+    {
+        if (!IsHovered)
             return;
 
-        _returnValue = ButtonType switch
-        {
-            TitleBarButtonType.Help => User32.WM_NCHITTEST.HTHELP,
-            TitleBarButtonType.Minimize => User32.WM_NCHITTEST.HTMINBUTTON,
-            TitleBarButtonType.Close => User32.WM_NCHITTEST.HTCLOSE,
-            TitleBarButtonType.Restore => User32.WM_NCHITTEST.HTMAXBUTTON,
-            TitleBarButtonType.Maximize => User32.WM_NCHITTEST.HTMAXBUTTON,
-            _ => throw new ArgumentOutOfRangeException()
-        };
+        Background = _defaultBackgroundBrush;
+
+        IsHovered = false;
+        _isClickedDown = false;
+    }
+
+    /// <summary>
+    /// Invokes click on the button.
+    /// </summary>
+    public void InvokeClick()
+    {
+        if (new ButtonAutomationPeer(this).GetPattern(PatternInterface.Invoke) is IInvokeProvider invokeProvider)
+            invokeProvider.Invoke();
+
+        _isClickedDown = false;
     }
 
     internal bool ReactToHwndHook(User32.WM msg, IntPtr lParam, out IntPtr returnIntPtr)
@@ -77,6 +95,8 @@ internal bool ReactToHwndHook(User32.WM msg, IntPtr lParam, out IntPtr returnInt
                     Hover();
 
                     returnIntPtr = (IntPtr)_returnValue;
+
+                    Debug.WriteLine($"Hitting {ButtonType} | return code {returnIntPtr}");
                     return true;
                 }
 
@@ -110,40 +130,24 @@ internal bool ReactToHwndHook(User32.WM msg, IntPtr lParam, out IntPtr returnInt
         return false;
     }
 
-    /// <summary>
-    /// Invokes click on the button.
-    /// </summary>
-    private void InvokeClick()
-    {
-        if (new ButtonAutomationPeer(this).GetPattern(PatternInterface.Invoke) is IInvokeProvider invokeProvider)
-            invokeProvider.Invoke();
-
-        _isClickedDown = false;
-    }
-
-    /// <summary>
-    /// Forces button background to change.
-    /// </summary>
-    private void Hover()
+    private void UpdateReturnValue(TitleBarButtonType buttonType)
     {
-        if (IsHovered)
-            return;
-
-        Background = MouseOverBackground;
-        IsHovered = true;
+        _returnValue = buttonType switch
+        {
+            TitleBarButtonType.Unknown => User32.WM_NCHITTEST.HTNOWHERE,
+            TitleBarButtonType.Help => User32.WM_NCHITTEST.HTHELP,
+            TitleBarButtonType.Minimize => User32.WM_NCHITTEST.HTMINBUTTON,
+            TitleBarButtonType.Close => User32.WM_NCHITTEST.HTCLOSE,
+            TitleBarButtonType.Restore => User32.WM_NCHITTEST.HTMAXBUTTON,
+            TitleBarButtonType.Maximize => User32.WM_NCHITTEST.HTMAXBUTTON,
+            _ => throw new ArgumentOutOfRangeException(nameof(buttonType), buttonType, null)
+        };
     }
 
-    /// <summary>
-    /// Forces button background to change.
-    /// </summary>
-    public void RemoveHover()
+    private static void ButtonTypePropertyCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        if (!IsHovered)
-            return;
+        var titleBarButton = (TitleBarButton)d;
 
-        Background = _defaultBackgroundBrush;
-
-        IsHovered = false;
-        _isClickedDown = false;
+        titleBarButton.UpdateReturnValue((TitleBarButtonType)e.NewValue);
     }
 }
diff --git a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
index 765958272..fddfeae40 100644
--- a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
+++ b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
@@ -80,9 +80,7 @@
                                 <Condition Property="ButtonType" Value="{x:Static titleBar:TitleBarButtonType.Close}" />
                                 <Condition Property="IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
-                            <MultiTrigger.Setters>
-                                <Setter Property="Foreground" Value="#FFFFFFFF" />
-                            </MultiTrigger.Setters>
+                            <Setter Property="Foreground" Value="#FFFFFFFF" />
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -178,19 +176,19 @@
                                 <controls:TitleBarButton
                                     x:Name="PART_HelpButton"
                                     Grid.Column="0"
-                                    ButtonType="Help" />
+                                    ButtonType="Help"
+                                    Visibility="Collapsed" />
+
                                 <controls:TitleBarButton
                                     x:Name="PART_MinimizeButton"
                                     Grid.Column="1"
-                                    ButtonType="Minimize" />
+                                    ButtonType="Minimize"
+                                    Visibility="Collapsed" />
+
                                 <controls:TitleBarButton
                                     x:Name="PART_MaximizeButton"
                                     Grid.Column="2"
-                                    ButtonType="Maximize" />
-                                <controls:TitleBarButton
-                                    x:Name="PART_RestoreButton"
-                                    Grid.Column="3"
-                                    ButtonType="Restore"
+                                    ButtonType="Maximize"
                                     Visibility="Collapsed" />
 
                                 <controls:TitleBarButton
@@ -210,13 +208,6 @@
                             </MultiTrigger.Conditions>
                             <Setter TargetName="TitleGrid" Property="Visibility" Value="Collapsed" />
                         </MultiTrigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="ShowMaximize" Value="True" />
-                                <Condition Property="IsMaximized" Value="True" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
-                        </MultiTrigger>
                         <Trigger Property="Theme" Value="Dark">
                             <Setter Property="ButtonsBackground">
                                 <Setter.Value>
@@ -228,17 +219,22 @@
                             <Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
                             <Setter TargetName="Icon" Property="Margin" Value="0" />
                         </Trigger>
-                        <Trigger Property="IsMaximized" Value="True">
-                            <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                        <Trigger Property="ShowMinimize" Value="False">
-                            <Setter TargetName="PART_MinimizeButton" Property="Visibility" Value="Collapsed" />
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="ShowMaximize" Value="True" />
+                                <Condition Property="IsMaximized" Value="True" />
+                            </MultiTrigger.Conditions>
+
+                            <Setter TargetName="PART_MaximizeButton" Property="ButtonType" Value="Restore" />
+                        </MultiTrigger>
+                        <Trigger Property="ShowHelp" Value="True">
+                            <Setter TargetName="PART_HelpButton" Property="Visibility" Value="Visible" />
                         </Trigger>
-                        <Trigger Property="ShowMaximize" Value="False">
-                            <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
+                        <Trigger Property="ShowMinimize" Value="True">
+                            <Setter TargetName="PART_MinimizeButton" Property="Visibility" Value="Visible" />
                         </Trigger>
-                        <Trigger Property="ShowHelp" Value="False">
-                            <Setter TargetName="PART_HelpButton" Property="Visibility" Value="Collapsed" />
+                        <Trigger Property="ShowMaximize" Value="True">
+                            <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Visible" />
                         </Trigger>
                         <Trigger Property="ShowClose" Value="True">
                             <Setter TargetName="PART_CloseButton" Property="Visibility" Value="Visible" />

From 7df93e46b1d54723f8b44bf00279daf5c03efb6c Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Mon, 23 Jan 2023 21:12:02 +0600
Subject: [PATCH 6/8] clean up

---
 src/Wpf.Ui/Controls/TitleBar.cs          | 14 ++-----
 src/Wpf.Ui/Controls/TitleBarButton.cs    | 53 ++++++++++--------------
 src/Wpf.Ui/Styles/Controls/TitleBar.xaml | 28 ++++++-------
 3 files changed, 37 insertions(+), 58 deletions(-)

diff --git a/src/Wpf.Ui/Controls/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBar.cs
index 29cf4f5c4..9fecd3c8c 100644
--- a/src/Wpf.Ui/Controls/TitleBar.cs
+++ b/src/Wpf.Ui/Controls/TitleBar.cs
@@ -639,7 +639,7 @@ private IntPtr HwndSourceHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam
             if (!button.ReactToHwndHook(message, lParam, out var returnIntPtr))
                 continue;
 
-            //It happens that the background is not removed from the buttons and you can make all the buttons are in the IsHovered position
+            //It happens that the background is not removed from the buttons and you can make all the buttons are in the IsHovered=true
             //It cleans up
             foreach (var anotherButton in _buttons)
             {
@@ -656,16 +656,10 @@ private IntPtr HwndSourceHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam
             return returnIntPtr;
         }
 
-        switch (message)
+        if (message == User32.WM.NCHITTEST && this.IsMouseOverElement(lParam))
         {
-            case User32.WM.NCHITTEST:
-                if (this.IsMouseOverElement(lParam))
-                {
-                    handled = true;
-                    return (IntPtr)User32.WM_NCHITTEST.HTCAPTION;
-                }
-
-                break;
+            handled = true;
+            return (IntPtr)User32.WM_NCHITTEST.HTCAPTION;
         }
 
         return IntPtr.Zero;
diff --git a/src/Wpf.Ui/Controls/TitleBarButton.cs b/src/Wpf.Ui/Controls/TitleBarButton.cs
index b932e415e..5eb40970d 100644
--- a/src/Wpf.Ui/Controls/TitleBarButton.cs
+++ b/src/Wpf.Ui/Controls/TitleBarButton.cs
@@ -12,6 +12,10 @@ namespace Wpf.Ui.Controls;
 
 public class TitleBarButton : Wpf.Ui.Controls.Button
 {
+
+    /// <summary>
+    /// Property for <see cref="ButtonType"/>.
+    /// </summary>
     public static readonly DependencyProperty ButtonTypeProperty = DependencyProperty.Register(nameof(ButtonType),
         typeof(TitleBarButtonType), typeof(TitleBarButton), new PropertyMetadata(TitleBarButtonType.Unknown, ButtonTypePropertyCallback));
 
@@ -23,6 +27,9 @@ public class TitleBarButton : Wpf.Ui.Controls.Button
         typeof(Brush), typeof(TitleBarButton), new FrameworkPropertyMetadata(SystemColors.ControlTextBrush,
             FrameworkPropertyMetadataOptions.Inherits));
 
+    /// <summary>
+    /// Sets or gets the 
+    /// </summary>
     public TitleBarButtonType ButtonType
     {
         get => (TitleBarButtonType)GetValue(ButtonTypeProperty);
@@ -88,50 +95,34 @@ internal bool ReactToHwndHook(User32.WM msg, IntPtr lParam, out IntPtr returnInt
 
         switch (msg)
         {
-            // Hit test, for determining whether the mouse cursor is over one of the buttons
             case User32.WM.NCHITTEST:
                 if (this.IsMouseOverElement(lParam))
                 {
-                    Hover();
+                    //Debug.WriteLine($"Hitting {ButtonType} | return code {_returnValue}");
 
+                    Hover();
                     returnIntPtr = (IntPtr)_returnValue;
-
-                    Debug.WriteLine($"Hitting {ButtonType} | return code {returnIntPtr}");
                     return true;
                 }
 
                 RemoveHover();
-                break;
+                return false;
 
-            // Mouse leaves the window
-            case User32.WM.NCMOUSELEAVE:
+            case User32.WM.NCMOUSELEAVE: // Mouse leaves the window
                 RemoveHover();
-                break;
-
-            // Left button clicked down
-            case User32.WM.NCLBUTTONDOWN:
-                if (this.IsMouseOverElement(lParam))
-                {
-                    _isClickedDown = true;
-                    return true;
-                }
-                break;
-
-            // Left button clicked up
-            case User32.WM.NCLBUTTONUP:
-                if (_isClickedDown && this.IsMouseOverElement(lParam))
-                {
-                    InvokeClick();
-                    return true;
-                }
-                break;
+                return false;
+            case User32.WM.NCLBUTTONDOWN when this.IsMouseOverElement(lParam): // Left button clicked down
+                _isClickedDown = true;
+                return true;
+            case User32.WM.NCLBUTTONUP when _isClickedDown && this.IsMouseOverElement(lParam): // Left button clicked up
+                InvokeClick();
+                return true;
+            default:
+                return false;
         }
-
-        return false;
     }
 
-    private void UpdateReturnValue(TitleBarButtonType buttonType)
-    {
+    private void UpdateReturnValue(TitleBarButtonType buttonType) =>
         _returnValue = buttonType switch
         {
             TitleBarButtonType.Unknown => User32.WM_NCHITTEST.HTNOWHERE,
@@ -142,12 +133,10 @@ private void UpdateReturnValue(TitleBarButtonType buttonType)
             TitleBarButtonType.Maximize => User32.WM_NCHITTEST.HTMAXBUTTON,
             _ => throw new ArgumentOutOfRangeException(nameof(buttonType), buttonType, null)
         };
-    }
 
     private static void ButtonTypePropertyCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         var titleBarButton = (TitleBarButton)d;
-
         titleBarButton.UpdateReturnValue((TitleBarButtonType)e.NewValue);
     }
 }
diff --git a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
index fddfeae40..396e4fc8a 100644
--- a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
+++ b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
@@ -176,27 +176,23 @@
                                 <controls:TitleBarButton
                                     x:Name="PART_HelpButton"
                                     Grid.Column="0"
-                                    ButtonType="Help"
-                                    Visibility="Collapsed" />
+                                    ButtonType="Help" />
 
                                 <controls:TitleBarButton
                                     x:Name="PART_MinimizeButton"
                                     Grid.Column="1"
-                                    ButtonType="Minimize"
-                                    Visibility="Collapsed" />
+                                    ButtonType="Minimize" />
 
                                 <controls:TitleBarButton
                                     x:Name="PART_MaximizeButton"
                                     Grid.Column="2"
-                                    ButtonType="Maximize"
-                                    Visibility="Collapsed" />
+                                    ButtonType="Maximize" />
 
                                 <controls:TitleBarButton
                                     x:Name="PART_CloseButton"
                                     Grid.Column="4"
                                     ButtonType="Close"
-                                    MouseOverBackground="{DynamicResource PaletteRedBrush}"
-                                    Visibility="Collapsed" />
+                                    MouseOverBackground="{DynamicResource PaletteRedBrush}" />
                             </Grid>
                         </Grid>
                     </Grid>
@@ -227,17 +223,17 @@
 
                             <Setter TargetName="PART_MaximizeButton" Property="ButtonType" Value="Restore" />
                         </MultiTrigger>
-                        <Trigger Property="ShowHelp" Value="True">
-                            <Setter TargetName="PART_HelpButton" Property="Visibility" Value="Visible" />
+                        <Trigger Property="ShowHelp" Value="False">
+                            <Setter TargetName="PART_HelpButton" Property="Visibility" Value="Collapsed" />
                         </Trigger>
-                        <Trigger Property="ShowMinimize" Value="True">
-                            <Setter TargetName="PART_MinimizeButton" Property="Visibility" Value="Visible" />
+                        <Trigger Property="ShowMinimize" Value="False">
+                            <Setter TargetName="PART_MinimizeButton" Property="Visibility" Value="Collapsed" />
                         </Trigger>
-                        <Trigger Property="ShowMaximize" Value="True">
-                            <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Visible" />
+                        <Trigger Property="ShowMaximize" Value="False">
+                            <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
                         </Trigger>
-                        <Trigger Property="ShowClose" Value="True">
-                            <Setter TargetName="PART_CloseButton" Property="Visibility" Value="Visible" />
+                        <Trigger Property="ShowClose" Value="False">
+                            <Setter TargetName="PART_CloseButton" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>

From 2386f957b0b157b368e69c7513d1d892365caff1 Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Mon, 23 Jan 2023 21:56:54 +0600
Subject: [PATCH 7/8] added closing the window by double clicking on the icon

---
 src/Wpf.Ui/Controls/TitleBar.cs          | 41 ++++++++++++++++++------
 src/Wpf.Ui/Styles/Controls/TitleBar.xaml |  6 ++--
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/Wpf.Ui/Controls/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBar.cs
index 9fecd3c8c..70250c894 100644
--- a/src/Wpf.Ui/Controls/TitleBar.cs
+++ b/src/Wpf.Ui/Controls/TitleBar.cs
@@ -22,6 +22,7 @@ namespace Wpf.Ui.Controls;
 /// Custom navigation buttons for the window.
 /// </summary>
 [TemplatePart(Name = ElementMainGrid, Type = typeof(System.Windows.Controls.Grid))]
+[TemplatePart(Name = ElementIcon, Type = typeof(System.Windows.Controls.Image))]
 [TemplatePart(Name = ElementHelpButton, Type = typeof(TitleBarButton))]
 [TemplatePart(Name = ElementMinimizeButton, Type = typeof(TitleBarButton))]
 [TemplatePart(Name = ElementMaximizeButton, Type = typeof(TitleBarButton))]
@@ -29,6 +30,7 @@ namespace Wpf.Ui.Controls;
 [TemplatePart(Name = ElementCloseButton, Type = typeof(TitleBarButton))]
 public class TitleBar : System.Windows.Controls.Control, IThemeControl
 {
+    private const string ElementIcon = "PART_Icon";
     private const string ElementMainGrid = "PART_MainGrid";
     private const string ElementHelpButton = "PART_HelpButton";
     private const string ElementMinimizeButton = "PART_MinimizeButton";
@@ -134,6 +136,13 @@ public class TitleBar : System.Windows.Controls.Control, IThemeControl
         nameof(Icon),
         typeof(ImageSource), typeof(TitleBar), new PropertyMetadata(null));
 
+    /// <summary>
+    /// Property for <see cref="CloseWindowByDoubleClickOnIcon"/>.
+    /// </summary>
+    public static readonly DependencyProperty CloseWindowByDoubleClickOnIconProperty = DependencyProperty.Register(
+        nameof(CloseWindowByDoubleClickOnIcon),
+        typeof(bool), typeof(TitleBar), new PropertyMetadata(true));
+
     /// <summary>
     /// Property for <see cref="Tray"/>.
     /// </summary>
@@ -302,6 +311,15 @@ public ImageSource Icon
         set => SetValue(IconProperty, value);
     }
 
+    /// <summary>
+    /// Enables or disable closing the window by double clicking on the icon
+    /// </summary>
+    public bool CloseWindowByDoubleClickOnIcon
+    {
+        get => (bool)GetValue(CloseWindowByDoubleClickOnIconProperty);
+        set => SetValue(CloseWindowByDoubleClickOnIconProperty, value);
+    }
+
     /// <summary>
     /// Tray icon.
     /// </summary>
@@ -367,6 +385,7 @@ public event RoutedEventHandler HelpClicked
     private Interop.WinDef.POINT _doubleClickPoint;
     private System.Windows.Window _currentWindow = null!;
     private System.Windows.Controls.Grid _mainGrid = null!;
+    private System.Windows.Controls.Image _icon = null!;
     private readonly TitleBarButton[] _buttons = new TitleBarButton[4];
 
     /// <summary>
@@ -398,7 +417,6 @@ protected virtual void OnLoaded(object sender, RoutedEventArgs e)
         _currentWindow.StateChanged += OnParentWindowStateChanged;
 
         var handle = new WindowInteropHelper(_currentWindow).EnsureHandle();
-
         var windowSource = HwndSource.FromHwnd(handle) ?? throw new ArgumentNullException("Window source is null");
         windowSource.AddHook(HwndSourceHook);
     }
@@ -426,6 +444,8 @@ public override void OnApplyTemplate()
         _mainGrid.MouseLeftButtonDown += OnMainGridMouseLeftButtonDown;
         _mainGrid.MouseMove += OnMainGridMouseMove;
 
+        _icon = GetTemplateChild<System.Windows.Controls.Image>(ElementIcon);
+
         var helpButton = GetTemplateChild<TitleBarButton>(ElementHelpButton);
         var minimizeButton = GetTemplateChild<TitleBarButton>(ElementMinimizeButton);
         var maximizeButton = GetTemplateChild<TitleBarButton>(ElementMaximizeButton);
@@ -459,10 +479,6 @@ private void CloseWindow()
             return;
         }
 
-        var handle = new WindowInteropHelper(_currentWindow).EnsureHandle();
-        var windowSource = HwndSource.FromHwnd(handle);
-        windowSource?.RemoveHook(HwndSourceHook);
-
         _currentWindow.Close();
     }
 
@@ -656,13 +672,18 @@ private IntPtr HwndSourceHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam
             return returnIntPtr;
         }
 
-        if (message == User32.WM.NCHITTEST && this.IsMouseOverElement(lParam))
+        switch (message)
         {
-            handled = true;
-            return (IntPtr)User32.WM_NCHITTEST.HTCAPTION;
+            case User32.WM.NCHITTEST when CloseWindowByDoubleClickOnIcon && _icon.IsMouseOverElement(lParam):
+                handled = true;
+                //Ideally, clicking on the icon should open the system menu, but when the system menu is opened manually, double-clicking on the icon does not close the window
+                return (IntPtr)User32.WM_NCHITTEST.HTSYSMENU;
+            case User32.WM.NCHITTEST when this.IsMouseOverElement(lParam):
+                handled = true;
+                return (IntPtr)User32.WM_NCHITTEST.HTCAPTION;
+            default:
+                return IntPtr.Zero;
         }
-
-        return IntPtr.Zero;
     }
 
     private T GetTemplateChild<T>(string name) where T : DependencyObject
diff --git a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
index 396e4fc8a..1363c3cb1 100644
--- a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
+++ b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
@@ -137,7 +137,7 @@
 
                             <!--  Custom application icon  -->
                             <Image
-                                x:Name="Icon"
+                                x:Name="PART_Icon"
                                 Grid.Column="0"
                                 Height="19"
                                 Margin="0,0,6,0"
@@ -212,8 +212,8 @@
                             </Setter>
                         </Trigger>
                         <Trigger Property="Icon" Value="{x:Null}">
-                            <Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="Icon" Property="Margin" Value="0" />
+                            <Setter TargetName="PART_Icon" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_Icon" Property="Margin" Value="0" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>

From 83fe0de3db0eaba7a398b9aa8ba6db2e630bb14c Mon Sep 17 00:00:00 2001
From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com>
Date: Mon, 23 Jan 2023 22:07:58 +0600
Subject: [PATCH 8/8] changed location of the TitleBarButtonType

---
 src/Wpf.Ui/Controls/TitleBar.cs               |  3 +--
 src/Wpf.Ui/Controls/TitleBarButton.cs         |  3 +--
 .../TitleBarButtonType.cs                     |  2 +-
 src/Wpf.Ui/Styles/Controls/TitleBar.xaml      | 25 +++++++++----------
 4 files changed, 15 insertions(+), 18 deletions(-)
 rename src/Wpf.Ui/{TitleBar => Controls}/TitleBarButtonType.cs (96%)

diff --git a/src/Wpf.Ui/Controls/TitleBar.cs b/src/Wpf.Ui/Controls/TitleBar.cs
index 70250c894..0535b4228 100644
--- a/src/Wpf.Ui/Controls/TitleBar.cs
+++ b/src/Wpf.Ui/Controls/TitleBar.cs
@@ -14,7 +14,6 @@
 using Wpf.Ui.Dpi;
 using Wpf.Ui.Extensions;
 using Wpf.Ui.Interop;
-using Wpf.Ui.TitleBar;
 
 namespace Wpf.Ui.Controls;
 
@@ -410,7 +409,7 @@ protected override void OnInitialized(EventArgs e)
 
     protected virtual void OnLoaded(object sender, RoutedEventArgs e)
     {
-        if (DesignerProperties.GetIsInDesignMode(this))
+        if (DesignerHelper.IsInDesignMode)
             return;
 
         _currentWindow = System.Windows.Window.GetWindow(this) ?? throw new ArgumentNullException("Window is null");
diff --git a/src/Wpf.Ui/Controls/TitleBarButton.cs b/src/Wpf.Ui/Controls/TitleBarButton.cs
index 5eb40970d..0b818f5c0 100644
--- a/src/Wpf.Ui/Controls/TitleBarButton.cs
+++ b/src/Wpf.Ui/Controls/TitleBarButton.cs
@@ -6,11 +6,10 @@
 using System.Windows.Media;
 using Wpf.Ui.Extensions;
 using Wpf.Ui.Interop;
-using Wpf.Ui.TitleBar;
 
 namespace Wpf.Ui.Controls;
 
-public class TitleBarButton : Wpf.Ui.Controls.Button
+internal class TitleBarButton : Wpf.Ui.Controls.Button
 {
 
     /// <summary>
diff --git a/src/Wpf.Ui/TitleBar/TitleBarButtonType.cs b/src/Wpf.Ui/Controls/TitleBarButtonType.cs
similarity index 96%
rename from src/Wpf.Ui/TitleBar/TitleBarButtonType.cs
rename to src/Wpf.Ui/Controls/TitleBarButtonType.cs
index af2f0533d..1e2196c3c 100644
--- a/src/Wpf.Ui/TitleBar/TitleBarButtonType.cs
+++ b/src/Wpf.Ui/Controls/TitleBarButtonType.cs
@@ -3,7 +3,7 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
-namespace Wpf.Ui.TitleBar;
+namespace Wpf.Ui.Controls;
 
 /// <summary>
 /// Type of the Title Bar button.
diff --git a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
index 1363c3cb1..4dd48238b 100644
--- a/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
+++ b/src/Wpf.Ui/Styles/Controls/TitleBar.xaml
@@ -8,8 +8,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:titleBar="clr-namespace:Wpf.Ui.TitleBar">
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
 
     <Style TargetType="{x:Type controls:TitleBarButton}">
         <Setter Property="Width" Value="44" />
@@ -48,36 +47,36 @@
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter TargetName="LayoutRoot" Property="Background" Value="{Binding Path=MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
                         </Trigger>
-                        <Trigger Property="ButtonType" Value="{x:Static titleBar:TitleBarButtonType.Help}">
-                            <Setter Property="CommandParameter" Value="{x:Static titleBar:TitleBarButtonType.Help}" />
+                        <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" />
                             <Setter TargetName="ViewBox" Property="Height" Value="13" />
                             <Setter TargetName="Canvas" Property="Width" Value="24" />
                             <Setter TargetName="Canvas" Property="Height" Value="41" />
                             <Setter TargetName="CanvasPath" Property="Data" Value="M20.56,11.57c0-1.19-.24-2.31-.71-3.36-.47-1.05-1.11-1.96-1.92-2.74-.8-.78-1.74-1.4-2.81-1.85-1.07-.45-2.2-.68-3.37-.68s-2.37,.23-3.44,.69c-1.07,.46-2,1.09-2.8,1.88s-1.42,1.73-1.88,2.8c-.46,1.07-.69,2.22-.69,3.44,0,.4-.15,.74-.44,1.03s-.64,.44-1.03,.44c-.49,0-.86-.17-1.1-.52-.25-.34-.37-.74-.37-1.18,0-1.59,.32-3.09,.95-4.49,.63-1.4,1.49-2.62,2.57-3.66,1.08-1.04,2.33-1.86,3.74-2.47,1.42-.6,2.91-.91,4.49-.91s3.07,.3,4.49,.91c1.42,.6,2.66,1.43,3.74,2.47,1.08,1.04,1.93,2.26,2.57,3.66,.63,1.4,.95,2.9,.95,4.49,0,1.24-.13,2.32-.39,3.25-.26,.93-.63,1.77-1.12,2.54-.49,.77-1.08,1.49-1.78,2.18-.7,.69-1.48,1.42-2.35,2.2-.44,.4-.88,.78-1.31,1.16-.43,.38-.84,.78-1.24,1.21-.5,.55-.89,1.08-1.17,1.59-.28,.51-.48,1.03-.62,1.56-.14,.53-.22,1.09-.25,1.69-.03,.6-.05,1.25-.05,1.95,0,.4-.15,.74-.44,1.03-.29,.29-.64,.44-1.03,.44-.34,0-.6-.06-.79-.18-.19-.12-.34-.29-.44-.49-.1-.21-.17-.44-.2-.7-.03-.26-.05-.52-.05-.78v-.78c0-1.21,.15-2.28,.44-3.2,.29-.93,.68-1.76,1.16-2.5,.48-.74,1.03-1.41,1.65-2.02,.62-.6,1.25-1.19,1.89-1.74,.64-.56,1.27-1.11,1.88-1.66,.61-.55,1.16-1.15,1.64-1.8,.48-.65,.87-1.37,1.17-2.16,.3-.79,.45-1.69,.45-2.72Zm-11.02,27.36c0-.61,.21-1.13,.64-1.56,.43-.43,.95-.64,1.56-.64s1.13,.21,1.56,.64c.43,.43,.64,.95,.64,1.56s-.21,1.13-.64,1.56c-.43,.43-.95,.64-1.56,.64s-1.13-.21-1.56-.64c-.43-.43-.64-.95-.64-1.56Z" />
                         </Trigger>
-                        <Trigger Property="ButtonType" Value="{x:Static titleBar:TitleBarButtonType.Minimize}">
-                            <Setter Property="CommandParameter" Value="{x:Static titleBar:TitleBarButtonType.Minimize}" />
+                        <Trigger Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Minimize}">
+                            <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Minimize}" />
                             <Setter TargetName="Canvas" Property="Width" Value="72" />
                             <Setter TargetName="Canvas" Property="Height" Value="8" />
                             <Setter TargetName="CanvasPath" Property="Data" Value="M3.59,7.21A3.56,3.56,0,0,1,2.2,6.93a3.66,3.66,0,0,1-1.15-.78A3.88,3.88,0,0,1,.28,5,3.42,3.42,0,0,1,0,3.62,3.45,3.45,0,0,1,.28,2.23a4.12,4.12,0,0,1,.77-1.16A3.52,3.52,0,0,1,2.2.28,3.39,3.39,0,0,1,3.59,0H68.41A3.39,3.39,0,0,1,69.8.28,3.52,3.52,0,0,1,71,1.07a4.12,4.12,0,0,1,.77,1.16A3.45,3.45,0,0,1,72,3.62,3.42,3.42,0,0,1,71.72,5,3.88,3.88,0,0,1,71,6.15a3.66,3.66,0,0,1-1.15.78,3.56,3.56,0,0,1-1.39.28Z" />
                         </Trigger>
-                        <Trigger Property="ButtonType" Value="{x:Static titleBar:TitleBarButtonType.Restore}">
-                            <Setter Property="CommandParameter" Value="{x:Static titleBar:TitleBarButtonType.Restore}" />
+                        <Trigger Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Restore}">
+                            <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Restore}" />
                             <Setter TargetName="CanvasPath" Property="Data" Value="M10.62,72a9.92,9.92,0,0,1-4-.86A11.15,11.15,0,0,1,.86,65.43,9.92,9.92,0,0,1,0,61.38V25A9.86,9.86,0,0,1,.86,21,11.32,11.32,0,0,1,3.18,17.6a11,11,0,0,1,3.38-2.32,9.68,9.68,0,0,1,4.06-.87H47a9.84,9.84,0,0,1,4.08.87A11,11,0,0,1,56.72,21,9.84,9.84,0,0,1,57.59,25V61.38a9.68,9.68,0,0,1-.87,4.06,11,11,0,0,1-2.32,3.38A11.32,11.32,0,0,1,51,71.14,9.86,9.86,0,0,1,47,72Zm36.17-7.21a3.39,3.39,0,0,0,1.39-.28,3.79,3.79,0,0,0,1.16-.77,3.47,3.47,0,0,0,1.07-2.53v-36a3.55,3.55,0,0,0-.28-1.41,3.51,3.51,0,0,0-.77-1.16,3.67,3.67,0,0,0-1.16-.77,3.55,3.55,0,0,0-1.41-.28h-36a3.45,3.45,0,0,0-1.39.28,3.59,3.59,0,0,0-1.14.79,3.79,3.79,0,0,0-.77,1.16,3.39,3.39,0,0,0-.28,1.39v36a3.45,3.45,0,0,0,.28,1.39A3.62,3.62,0,0,0,9.4,64.51a3.45,3.45,0,0,0,1.39.28Zm18-43.45a13.14,13.14,0,0,0-1.16-5.5,14.41,14.41,0,0,0-3.14-4.5,15,15,0,0,0-4.61-3,14.14,14.14,0,0,0-5.5-1.1H15A10.73,10.73,0,0,1,21.88.51,10.93,10.93,0,0,1,25.21,0H50.38a20.82,20.82,0,0,1,8.4,1.71A21.72,21.72,0,0,1,70.29,13.18,20.91,20.91,0,0,1,72,21.59v25.2a10.93,10.93,0,0,1-.51,3.33A10.71,10.71,0,0,1,70,53.05a10.84,10.84,0,0,1-2.28,2.36,10.66,10.66,0,0,1-3,1.58Z" />
                         </Trigger>
-                        <Trigger Property="ButtonType" Value="{x:Static titleBar:TitleBarButtonType.Maximize}">
-                            <Setter Property="CommandParameter" Value="{x:Static titleBar:TitleBarButtonType.Maximize}" />
+                        <Trigger Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Maximize}">
+                            <Setter Property="CommandParameter" Value="{x:Static controls:TitleBarButtonType.Maximize}" />
                             <Setter TargetName="CanvasPath" Property="Data" Value="M10.62,72a9.92,9.92,0,0,1-4-.86A11.15,11.15,0,0,1,.86,65.43,9.92,9.92,0,0,1,0,61.38V10.62a9.92,9.92,0,0,1,.86-4A11.15,11.15,0,0,1,6.57.86a9.92,9.92,0,0,1,4-.86H61.38a9.92,9.92,0,0,1,4.05.86,11.15,11.15,0,0,1,5.71,5.71,9.92,9.92,0,0,1,.86,4V61.38a9.92,9.92,0,0,1-.86,4.05,11.15,11.15,0,0,1-5.71,5.71,9.92,9.92,0,0,1-4.05.86Zm50.59-7.21a3.45,3.45,0,0,0,1.39-.28,3.62,3.62,0,0,0,1.91-1.91,3.45,3.45,0,0,0,.28-1.39V10.79a3.45,3.45,0,0,0-.28-1.39A3.62,3.62,0,0,0,62.6,7.49a3.45,3.45,0,0,0-1.39-.28H10.79a3.45,3.45,0,0,0-1.39.28A3.62,3.62,0,0,0,7.49,9.4a3.45,3.45,0,0,0-.28,1.39V61.21a3.45,3.45,0,0,0,.28,1.39A3.62,3.62,0,0,0,9.4,64.51a3.45,3.45,0,0,0,1.39.28Z" />
                         </Trigger>
-                        <Trigger Property="ButtonType" Value="{x:Static titleBar:TitleBarButtonType.Close}">
-                            <Setter Property="CommandParameter" Value="{x:Static titleBar:TitleBarButtonType.Close}" />
+                        <Trigger Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Close}">
+                            <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 titleBar:TitleBarButtonType.Close}" />
+                                <Condition Property="ButtonType" Value="{x:Static controls:TitleBarButtonType.Close}" />
                                 <Condition Property="IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter Property="Foreground" Value="#FFFFFFFF" />