Init

Author: 0x5bfa

.github/NOTICE.md

@@ -199,35 +199,6 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ```
 
-## INI File Parser
-
-**Source**: [https://github.com/rickyah/ini-parser](https://github.com/rickyah/ini-parser)
-
-### License
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2008 Ricardo Amores Hernández
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-```
-
 ## SevenZipSharp
 
 **Source**: [https://github.com/files-community/SevenZipSharp](https://github.com/files-community/SevenZipSharp)
@@ -675,36 +646,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ```
 
-## WinUIEx
-
-**Source**: [https://github.com/dotMorten/WinUIEx](https://github.com/dotMorten/WinUIEx)
-
-### License
-
-```
-MIT License
-
-Copyright (c) 2021 Morten Nielsen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-
 ## libgit2sharp
 
 **Source**: [https://github.com/libgit2/libgit2sharp](https://github.com/libgit2/libgit2sharp)
@@ -762,4 +703,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
-```
+```

src/Files.App/Data/Contexts/Window/WindowContext.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.UI.Windowing;
 
 namespace Files.App.Data.Contexts
@@ -13,15 +12,18 @@ internal sealed class WindowContext : ObservableObject, IWindowContext
 
 		public WindowContext()
 		{
-			MainWindow.Instance.PresenterChanged += Window_PresenterChanged;
+			MainWindow.Instance.AppWindow.Changed += AppWindow_Changed;
 		}
 
-		private void Window_PresenterChanged(object? sender, AppWindowPresenter e)
+		private void AppWindow_Changed(AppWindow sender, AppWindowChangedEventArgs args)
 		{
-			SetProperty(
-				ref isCompactOverlay,
-				e.Kind is AppWindowPresenterKind.CompactOverlay,
-				nameof(IsCompactOverlay));
+			if (args.DidPresenterChange)
+			{
+				SetProperty(
+					ref isCompactOverlay,
+					sender.Presenter.Kind is AppWindowPresenterKind.CompactOverlay,
+					nameof(IsCompactOverlay));
+			}
 		}
 	}
 }

src/Files.App/Data/Items/WindowEx.cs

@@ -0,0 +1,46 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+using Microsoft.UI.Xaml;
+using System.Runtime.InteropServices;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.UI.WindowsAndMessaging;
+
+namespace Files.App.Data.Items
+{
+	public unsafe class WindowEx : Window
+	{
+		private WNDPROC* _oldWndProc = default;
+
+		public int MinWidth = 400;
+		public int MinHeight = 300;
+
+		public unsafe WindowEx()
+		{
+			var hWnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
+			WNDPROC newWndProc = new(NewWindowProc);
+			_oldWndProc = (WNDPROC*)PInvoke.SetWindowLongPtr(new(hWnd), WINDOW_LONG_PTR_INDEX.GWL_WNDPROC, new(&newWndProc));
+		}
+
+		private LRESULT NewWindowProc(HWND param0, uint param1, WPARAM param2, LPARAM param3)
+		{
+			switch (param1)
+			{
+				case 0x0024: /*WM_GETMINMAXINFO*/
+					{
+						var dpi = PInvoke.GetDpiForWindow(new(param0));
+						float scalingFactor = (float)dpi / 96;
+
+						MINMAXINFO minMaxInfo = Marshal.PtrToStructure<MINMAXINFO>(param3);
+						minMaxInfo.ptMinTrackSize.X = (int)(MinWidth * scalingFactor);
+						minMaxInfo.ptMinTrackSize.Y = (int)(MinHeight * scalingFactor);
+						Marshal.StructureToPtr(minMaxInfo, param3, true);
+						break;
+					}
+			}
+
+			return PInvoke.CallWindowProc(*_oldWndProc, param0, param1, param2, param3);
+		}
+	}
+}

src/Files.App/Files.App.csproj

@@ -85,7 +85,6 @@
         <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
         <PackageReference Include="TagLibSharp" Version="2.3.0" />
         <PackageReference Include="Tulpep.ActiveDirectoryObjectPicker" Version="3.0.11" />
-        <PackageReference Include="WinUIEx" Version="2.3.4" />
         <PackageReference Include="Vanara.Windows.Extensions" Version="4.0.1" />
         <PackageReference Include="Vanara.Windows.Shell" Version="4.0.1" />
         <PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />

src/Files.App/Helpers/Win32/Win32Helper.WindowManagement.cs

@@ -2,9 +2,12 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Microsoft.UI.Input;
+using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using Vanara.PInvoke;
+using Windows.Graphics;
 using Windows.Win32;
 using Windows.Win32.UI.WindowsAndMessaging;
 using static Vanara.PInvoke.User32;
@@ -75,5 +78,26 @@ public static IntPtr SetWindowLong(HWND hWnd, WindowLongFlags nIndex, IntPtr dwN
 					? Win32PInvoke.SetWindowLongPtr32(hWnd, nIndex, dwNewLong)
 					: Win32PInvoke.SetWindowLongPtr64(hWnd, nIndex, dwNewLong);
 		}
+
+		public static void UpdateOverlappedPresenter(Window window, Action<OverlappedPresenter> action)
+		{
+			ArgumentNullException.ThrowIfNull(window);
+
+			var appWindow = window.AppWindow;
+			if (appWindow.Presenter is OverlappedPresenter overlapped)
+				action(overlapped);
+			else
+				throw new NotSupportedException($"Not supported with a {appWindow.Presenter.Kind} presenter");
+		}
+
+		public static void SetIsMaximizableWindow(Window window, bool maximizable)
+		{
+			UpdateOverlappedPresenter(window, (c) => c.IsMaximizable = maximizable);
+		}
+
+		public static void SetIsMinimizableWindow(Window window, bool minimizable)
+		{
+			UpdateOverlappedPresenter(window, (c) => c.IsMinimizable = minimizable);
+		}
 	}
 }

src/Files.App/Helpers/Win32/Win32PInvoke.Methods.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Microsoft.UI;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
@@ -511,6 +512,11 @@ static extern int SHGetKnownFolderPath(
 			out IntPtr pszPath
 		);
 
+		[DllImport("Microsoft.Internal.FrameworkUdk.dll", EntryPoint = "Windowing_GetWindowHandleFromWindowId", CharSet = CharSet.Unicode)]
+		private static extern IntPtr GetWindowHandleFromWindowId(
+			WindowId windowId,
+			out nint result);
+
 		public static string GetFolderFromKnownFolderGUID(Guid guid)
 		{
 			IntPtr pPath;

src/Files.App/MainWindow.xaml

@@ -1,9 +1,9 @@
 <!--  Copyright (c) 2024 Files Community. Licensed under the MIT License. See the LICENSE.  -->
-<winuiex:WindowEx
+<items:WindowEx
 	x:Class="Files.App.MainWindow"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:items="using:Files.App.Data.Items"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:winuiex="using:WinUIEx"
 	mc:Ignorable="d" />

src/Files.App/MainWindow.xaml.cs

@@ -1,14 +1,17 @@
-// Copyright (c) 2024 Files Community
+// Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
 using Microsoft.UI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.UI.Xaml.Navigation;
+using System.Runtime.InteropServices;
 using Windows.ApplicationModel.Activation;
 using Windows.Storage;
-using WinUIEx;
+using Windows.Win32;
+using Windows.Win32.UI.WindowsAndMessaging;
+using static Vanara.PInvoke.User32;
 using IO = System.IO;
 
 namespace Files.App
@@ -18,38 +21,31 @@ public sealed partial class MainWindow : WindowEx
 		private static MainWindow? _Instance;
 		public static MainWindow Instance => _Instance ??= new();
 
-		public IntPtr WindowHandle { get; }
+		public nint WindowHandle { get; }
 
-		private MainWindow()
+		public MainWindow()
 		{
-			WindowHandle = this.GetWindowHandle();
-
 			InitializeComponent();
 
-			EnsureEarlyWindow();
-		}
-
-		private void EnsureEarlyWindow()
-		{
-			// Set PersistenceId
-			PersistenceId = "FilesMainWindow";
-
-			// Set minimum sizes
-			MinHeight = 416;
-			MinWidth = 516;
+			WindowHandle = WinRT.Interop.WindowNative.GetWindowHandle(this);
+			ExtendsContentIntoTitleBar = true;
+			Title = "Files";
 
-			AppWindow.Title = "Files";
-			AppWindow.SetIcon(AppLifecycleHelper.AppIconPath);
-			AppWindow.TitleBar.ExtendsContentIntoTitleBar = true;
 			AppWindow.TitleBar.ButtonBackgroundColor = Colors.Transparent;
 			AppWindow.TitleBar.ButtonInactiveBackgroundColor = Colors.Transparent;
+			AppWindow.TitleBar.ButtonPressedBackgroundColor = Colors.Transparent;
+			AppWindow.TitleBar.ButtonHoverBackgroundColor = Colors.Transparent;
+			AppWindow.SetIcon(AppLifecycleHelper.AppIconPath);
+
+			MinHeight = 550;
+			MinWidth = 460;
 
 			// Workaround for full screen window messing up the taskbar
 			// https://github.com/microsoft/microsoft-ui-xaml/issues/8431
 			// This property should only be set if the "Automatically hide the taskbar" in Windows 11,
 			// or "Automatically hide the taskbar in desktop mode" in Windows 10 is enabled.
 			// Setting this property when the setting is disabled will result in the taskbar overlapping the application
-			if (AppLifecycleHelper.IsAutoHideTaskbarEnabled()) 
+			if (AppLifecycleHelper.IsAutoHideTaskbarEnabled())
 				Win32PInvoke.SetPropW(WindowHandle, "NonRudeHWND", new IntPtr(1));
 		}
 
@@ -205,7 +201,7 @@ public async Task InitializeApplicationAsync(object activatedEventArgs)
 			}
 
 			if (Windows.Win32.PInvoke.IsIconic(new(WindowHandle)))
-				Instance.Restore(); // Restore window if minimized
+				AppWindow.MoveInZOrderAtTop(); // Restore window if minimized
 		}
 
 		public Frame EnsureWindowIsInitialized()

src/Files.App/NativeMethods.txt

@@ -94,3 +94,8 @@ DesktopWallpaper
 SHCreateShellItemArrayFromIDLists
 ILCreateFromPath
 CLSIDFromString
+SetWindowLongPtr
+GetDpiForWindow
+CallWindowProc
+MINMAXINFO
+SUBCLASSPROC

src/Files.App/Utils/Storage/Helpers/FilePropertiesHelpers.cs

@@ -9,7 +9,6 @@
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.Windows.ApplicationModel.Resources;
 using System.Collections.Concurrent;
-using Windows.ApplicationModel;
 using Windows.Graphics;
 using Windows.Win32;
 
@@ -37,7 +36,7 @@ public static nint GetWindowHandle(Window w)
 			=> WinRT.Interop.WindowNative.GetWindowHandle(w);
 
 		private static TaskCompletionSource? PropertiesWindowsClosingTCS;
-		private static readonly BlockingCollection<WinUIEx.WindowEx> WindowCache = [];
+		private static readonly BlockingCollection<WindowEx> WindowCache = [];
 
 		/// <summary>
 		/// Open properties window
@@ -99,22 +98,21 @@ public static void OpenPropertiesWindow(object item, IShellPage associatedInstan
 
 			var frame = new Frame
 			{
-				RequestedTheme = (ElementTheme)AppThemeModeService.AppThemeMode
+				RequestedTheme = AppThemeModeService.AppThemeMode
 			};
 
-			WinUIEx.WindowEx propertiesWindow;
-			if (!WindowCache.TryTake(out propertiesWindow!))
+			if (!WindowCache.TryTake(out var propertiesWindow))
 			{
 				propertiesWindow = new();
 				propertiesWindow.Closed += PropertiesWindow_Closed;
 			}
 
-			propertiesWindow.IsMinimizable = false;
-			propertiesWindow.IsMaximizable = false;
-			propertiesWindow.MinWidth = 460;
+			var hWnd = WinRT.Interop.WindowNative.GetWindowHandle(propertiesWindow);
+			Win32Helper.SetIsMaximizableWindow(propertiesWindow, false);
+			Win32Helper.SetIsMinimizableWindow(propertiesWindow, false);
 			propertiesWindow.MinHeight = 550;
-			propertiesWindow.Width = 800;
-			propertiesWindow.Height = 550;
+			propertiesWindow.MinWidth = 460;
+			propertiesWindow.AppWindow.Resize(new(800, 550));
 			propertiesWindow.Content = frame;
 			propertiesWindow.SystemBackdrop = new AppSystemBackdrop(true);
 
@@ -127,7 +125,7 @@ public static void OpenPropertiesWindow(object item, IShellPage associatedInstan
 			appWindow.SetIcon(AppLifecycleHelper.AppIconPath);
 
 			frame.Navigate(
-				typeof(Views.Properties.MainPropertiesPage),
+				typeof(MainPropertiesPage),
 				new PropertiesPageNavigationParameter
 				{
 					Parameter = item,
@@ -160,7 +158,7 @@ public static void OpenPropertiesWindow(object item, IShellPage associatedInstan
 		// So instead of destroying the Window object, cache it and reuse it as a workaround.
 		private static void PropertiesWindow_Closed(object sender, WindowEventArgs args)
 		{
-			if (!App.AppModel.IsMainWindowClosed && sender is WinUIEx.WindowEx window)
+			if (!App.AppModel.IsMainWindowClosed && sender is WindowEx window)
 			{
 				args.Handled = true;