From 17381639b4c30840cd7159556c22557c05ce3803 Mon Sep 17 00:00:00 2001
From: Gaoyang <hangaoyang@me.com>
Date: Tue, 21 Jul 2026 10:24:48 +0800
Subject: [PATCH] feat: add maximize/restore button to main window toolbar

---
 .../Localization/Strings.en-US.xaml           |   1 +
 .../Localization/Strings.zh-CN.xaml           |   1 +
 src/ManagedDrive.App/MainWindow.xaml          |  15 +++
 src/ManagedDrive.App/MainWindow.xaml.cs       | 107 +++++++++++++++++-
 4 files changed, 120 insertions(+), 4 deletions(-)

diff --git a/src/ManagedDrive.App/Localization/Strings.en-US.xaml b/src/ManagedDrive.App/Localization/Strings.en-US.xaml
index 5912636..c9b172f 100644
--- a/src/ManagedDrive.App/Localization/Strings.en-US.xaml
+++ b/src/ManagedDrive.App/Localization/Strings.en-US.xaml
@@ -30,6 +30,7 @@
     <sys:String x:Key="Tip.Settings">Application settings</sys:String>
     <sys:String x:Key="Tip.ResetTempDirs">Reset Windows Temp Directories to defaults</sys:String>
     <sys:String x:Key="Tip.Minimize">Minimize</sys:String>
+    <sys:String x:Key="Tip.MaximizeRestore">Maximize/Restore</sys:String>
     <sys:String x:Key="Tip.HideToTray">Hide to tray</sys:String>
     <sys:String x:Key="Tip.CloseDialog">Close</sys:String>
     <sys:String x:Key="Col.MountPoint">Mount Point</sys:String>
diff --git a/src/ManagedDrive.App/Localization/Strings.zh-CN.xaml b/src/ManagedDrive.App/Localization/Strings.zh-CN.xaml
index 4ff1f25..9b4858a 100644
--- a/src/ManagedDrive.App/Localization/Strings.zh-CN.xaml
+++ b/src/ManagedDrive.App/Localization/Strings.zh-CN.xaml
@@ -30,6 +30,7 @@
     <sys:String x:Key="Tip.Settings">应用程序设置</sys:String>
     <sys:String x:Key="Tip.ResetTempDirs">将 Windows 临时目录重置为默认值</sys:String>
     <sys:String x:Key="Tip.Minimize">最小化</sys:String>
+    <sys:String x:Key="Tip.MaximizeRestore">最大化/还原</sys:String>
     <sys:String x:Key="Tip.HideToTray">最小化到系统托盘</sys:String>
     <sys:String x:Key="Tip.CloseDialog">关闭</sys:String>
     <sys:String x:Key="Col.MountPoint">挂载点</sys:String>
diff --git a/src/ManagedDrive.App/MainWindow.xaml b/src/ManagedDrive.App/MainWindow.xaml
index a31e79f..0b8f880 100644
--- a/src/ManagedDrive.App/MainWindow.xaml
+++ b/src/ManagedDrive.App/MainWindow.xaml
@@ -79,6 +79,21 @@
                             ToolTip="{DynamicResource Tip.Minimize}">
                         <TextBlock Style="{StaticResource IconText}" Text="&#xE921;" FontSize="12"/>
                     </Button>
+                    <Button Style="{StaticResource IconButton}"
+                            Click="MaximizeRestoreButton_Click"
+                            ToolTip="{DynamicResource Tip.MaximizeRestore}">
+                        <TextBlock x:Name="MaximizeRestoreIcon" Text="&#xE922;">
+                            <TextBlock.Style>
+                                <Style TargetType="TextBlock" BasedOn="{StaticResource IconText}">
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource AncestorType=Window}}" Value="Maximized">
+                                            <Setter Property="Text" Value="&#xE923;"/>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </TextBlock.Style>
+                        </TextBlock>
+                    </Button>
                     <Button Style="{StaticResource IconButton}"
                             Click="CloseButton_Click"
                             ToolTip="{DynamicResource Tip.HideToTray}">
diff --git a/src/ManagedDrive.App/MainWindow.xaml.cs b/src/ManagedDrive.App/MainWindow.xaml.cs
index e2b3368..78027a2 100644
--- a/src/ManagedDrive.App/MainWindow.xaml.cs
+++ b/src/ManagedDrive.App/MainWindow.xaml.cs
@@ -1,3 +1,6 @@
+using System.Runtime.InteropServices;
+using System.Windows.Interop;
+
 namespace ManagedDrive.App;
 
 /// <summary>
@@ -5,6 +8,9 @@ namespace ManagedDrive.App;
 /// </summary>
 public partial class MainWindow
 {
+    private const uint MonitorDefaultToNearest = 2;
+    private const int WindowsMessageGetMinMaxInfo = 0x0024;
+
     /// <summary>
     /// Initializes the main window and binds the supplied view model.
     /// </summary>
@@ -15,11 +21,69 @@ public MainWindow(MainViewModel viewModel)
         DataContext = viewModel;
     }
 
-    private void CloseButton_Click(object sender, RoutedEventArgs e) =>
-        Close();
+    /// <summary>
+    /// Hooks the window's message loop so maximizing clamps to the monitor's
+    /// work area instead of its full bounds, which WPF does not do automatically
+    /// for <c>WindowStyle="None"</c> windows and would otherwise cover the taskbar.
+    /// </summary>
+    protected override void OnSourceInitialized(EventArgs e)
+    {
+        base.OnSourceInitialized(e);
 
-    private void MinimizeButton_Click(object sender, RoutedEventArgs e) =>
-        WindowState = WindowState.Minimized;
+        if (PresentationSource.FromVisual(this) is HwndSource source)
+        {
+            source.AddHook(WndProc);
+        }
+    }
+
+    [DllImport("user32.dll")]
+    private static extern bool GetMonitorInfo(IntPtr hMonitor, ref MonitorInfo lpmi);
+
+    [DllImport("user32.dll")]
+    private static extern IntPtr MonitorFromWindow(IntPtr hwnd, uint dwFlags);
+
+    private static void WmGetMinMaxInfo(IntPtr hwnd, IntPtr lParam)
+    {
+        var monitor = MonitorFromWindow(hwnd, MonitorDefaultToNearest);
+        if (monitor == IntPtr.Zero)
+        {
+            return;
+        }
+
+        var monitorInfo = new MonitorInfo { cbSize = Marshal.SizeOf<MonitorInfo>() };
+        if (!GetMonitorInfo(monitor, ref monitorInfo))
+        {
+            return;
+        }
+
+        var workArea = monitorInfo.rcWork;
+        var monitorArea = monitorInfo.rcMonitor;
+
+        var minMaxInfo = Marshal.PtrToStructure<MinMaxInfo>(lParam);
+        minMaxInfo.ptMaxPosition.X = workArea.Left - monitorArea.Left;
+        minMaxInfo.ptMaxPosition.Y = workArea.Top - monitorArea.Top;
+        minMaxInfo.ptMaxSize.X = workArea.Right - workArea.Left;
+        minMaxInfo.ptMaxSize.Y = workArea.Bottom - workArea.Top;
+        Marshal.StructureToPtr(minMaxInfo, lParam, fDeleteOld: true);
+    }
+
+    private static IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+    {
+        if (msg == WindowsMessageGetMinMaxInfo)
+        {
+            WmGetMinMaxInfo(hwnd, lParam);
+            handled = true;
+        }
+
+        return IntPtr.Zero;
+    }
+
+    private void CloseButton_Click(object sender, RoutedEventArgs e) => Close();
+
+    private void MaximizeRestoreButton_Click(object sender, RoutedEventArgs e) =>
+        WindowState = WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
+
+    private void MinimizeButton_Click(object sender, RoutedEventArgs e) => WindowState = WindowState.Minimized;
 
     private void OverflowBtn_Click(object sender, RoutedEventArgs e)
     {
@@ -30,4 +94,39 @@ private void OverflowBtn_Click(object sender, RoutedEventArgs e)
             btn.ContextMenu.IsOpen = true;
         }
     }
+
+    [StructLayout(LayoutKind.Sequential)]
+    private struct MinMaxInfo
+    {
+        public Point ptReserved;
+        public Point ptMaxSize;
+        public Point ptMaxPosition;
+        public Point ptMinTrackSize;
+        public Point ptMaxTrackSize;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    private struct MonitorInfo
+    {
+        public int cbSize;
+        public Rect rcMonitor;
+        public Rect rcWork;
+        public uint dwFlags;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    private struct Point
+    {
+        public int X;
+        public int Y;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    private struct Rect
+    {
+        public int Left;
+        public int Top;
+        public int Right;
+        public int Bottom;
+    }
 }
\ No newline at end of file