A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Added Compact Overlay mode on Mac
Etienne Baudoux02296b6327e6
diff --git a/src/app/dev/DevToys.Blazor/Pages/Index.razor b/src/app/dev/DevToys.Blazor/Pages/Index.razorindex 6db81ef62..e148bc8ba 100644--- a/src/app/dev/DevToys.Blazor/Pages/Index.razor+++ b/src/app/dev/DevToys.Blazor/Pages/Index.razor@@ -35,13 +35,19 @@@if (ViewModel.SelectedMenuItem is GuiToolViewItem guiToolViewItem && WindowService.IsCompactOverlayMode){TitleBarInfoProvider.Title = "DevToys - " + guiToolViewItem.ToolInstance.LongOrShortDisplayTitle;- <TextBlock Text="@TitleBarInfoProvider.Title"- Style="margin-left: 16px;"/>+ if (OperatingSystem.IsWindows())+ {+ <TextBlock Text="@TitleBarInfoProvider.Title"+ Style="margin-left: 16px;" />+ }}else{TitleBarInfoProvider.Title = "DevToys";- <TextBlock Text="@TitleBarInfoProvider.Title" />+ if (OperatingSystem.IsWindows())+ {+ <TextBlock Text="@TitleBarInfoProvider.Title" />+ }}</HeaderLeft><HeaderRight>diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/App.xaml.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/App.xaml.csindex 2b318ebb8..fc5e49e2e 100644--- a/src/app/dev/platforms/desktop/DevToys.MacOS/App.xaml.cs+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/App.xaml.cs@@ -1,4 +1,6 @@using DevToys.Api;+using DevToys.Blazor.Core.Services;+using DevToys.Core;using DevToys.MacOS.Core;namespace DevToys.MacOS;@@ -15,8 +17,13 @@ public partial class App : Applicationprotected override Window CreateWindow(IActivationState? activationState){Window window = base.CreateWindow(activationState);- window.Width = 1200;- window.Height = 600;++ Guard.IsNotNull(MauiProgram.MefComposer);+ var titleBarInfoProvider = MauiProgram.MefComposer.Provider.Import<TitleBarInfoProvider>();++ Guard.IsNotNull(MauiProgram.ServiceProvider);+ var windowService = (WindowService)MauiProgram.ServiceProvider.GetService<IWindowService>()!;+ windowService.SetWindow(window, titleBarInfoProvider);return window;}diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/WindowService.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/WindowService.csindex ba74fc430..b7db12a0e 100644--- a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/WindowService.cs+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/WindowService.cs@@ -1,11 +1,20 @@+using System.Runtime.InteropServices;using DevToys.Blazor.Core.Services;+using DevToys.Core;using Foundation;+using Microsoft.Maui.Controls;+using ObjCRuntime;+using UIKit;namespace DevToys.MacOS.Core;internal sealed class WindowService : IWindowService{+ private Window? _window;+ private TitleBarInfoProvider? _titleBarInfoProvider;private bool _isCompactOverlayMode;+ private WindowStateBackup? _nonCompactOverlayModeWindowState;+ private WindowStateBackup? _compactOverlayModeWindowState;public event EventHandler<EventArgs>? WindowActivated;public event EventHandler<EventArgs>? WindowDeactivated;@@ -23,8 +32,7 @@ internal sealed class WindowService : IWindowServiceNSNotificationCenter.DefaultCenter.AddObserver(new NSString("NSWindowWillCloseNotification"), OnWindowClosing);}- // TODO: support Picture-in-Picture mode or mock it.- public bool IsCompactOverlayModeSupportedByPlatform => false;+ public bool IsCompactOverlayModeSupportedByPlatform => true;public bool IsCompactOverlayMode{@@ -37,9 +45,162 @@ internal sealed class WindowService : IWindowService}}+ internal void SetWindow(Window window, TitleBarInfoProvider titleBarInfoProvider)+ {+ Guard.IsNull(_window);+ Guard.IsNotNull(window);+ Guard.IsNotNull(titleBarInfoProvider);++ _window = window;+ _titleBarInfoProvider = titleBarInfoProvider;+ _titleBarInfoProvider.PropertyChanged += TitleBarInfoProvider_PropertyChanged;++ UpdateWindowTitle();+ }+private void UpdateCompactOverlayState(bool shouldEnterCompactOverlayMode){+ Guard.IsNotNull(_window);+ if (_window.Handler is null || _window.Handler.PlatformView is not UIWindow uiWindow)+ {+ return;+ }++ int top = (int)Math.Max(uiWindow.Screen.Bounds.Top, uiWindow.Screen.Bounds.Bottom);+ var uiWindowPosition = uiWindow.GetWindowPosition();+ if (shouldEnterCompactOverlayMode)+ {+ // Save the state of the window before entering compact overlay mode.+ _nonCompactOverlayModeWindowState+ = new(+ uiWindow.IsZoomed(),+ uiWindow.CoordinateSpace.Bounds.Height,+ uiWindow.CoordinateSpace.Bounds.Width,+ uiWindowPosition.Y,+ uiWindowPosition.X,+ _window.MaximumHeight,+ _window.MaximumWidth,+ _window.MinimumHeight,+ _window.MinimumWidth);++ // Enter compact overlay mode+ uiWindow.ToggleWindowAlwaysOnTop(alwaysOnTop: true);+ uiWindow.ToggleTitleBarButtons(hideButtons: true);+ uiWindow.ForceUnzoom();++ if (_compactOverlayModeWindowState is null)+ {+ // MacCatalyst doesn't support resizing programmatically. However a workaround to enable resizing is to set Minimum and Maximize size to the desired one.+ // https://learn.microsoft.com/en-us/dotnet/maui/fundamentals/windows#mac-catalyst+ _window.MinimumWidth = 600;+ _window.MaximumWidth = 600;+ _window.MinimumHeight = 400;+ _window.MaximumHeight = 400;++ // Give the Window time to resize+ _window.Dispatcher.Dispatch(() =>+ {+ // Set the actual minimum and maximum size we want to allow.+ _window.MinimumWidth = 340;+ _window.MinimumHeight = 400;+ _window.MaximumWidth = 640;+ _window.MaximumHeight = 800;+ });++ uiWindow.MoveWindow(+ x: ((uiWindow.Screen.Bounds.Left + uiWindow.Screen.Bounds.Width) / uiWindow.Screen.Scale) - 600 - 54,+ y: top - (uiWindow.Screen.Bounds.Top / uiWindow.Screen.Scale) - 54); // On mac, the screen origin starts at the bottom.+ }+ else+ {+ // MacCatalyst doesn't support resizing programmatically. However a workaround to enable resizing is to set Minimum and Maximize size to the desired one.+ // https://learn.microsoft.com/en-us/dotnet/maui/fundamentals/windows#mac-catalyst+ _window.MinimumWidth = _compactOverlayModeWindowState.Width;+ _window.MaximumWidth = _compactOverlayModeWindowState.Width;+ _window.MinimumHeight = _compactOverlayModeWindowState.Height;+ _window.MaximumHeight = _compactOverlayModeWindowState.Height;++ // Give the Window time to resize+ _window.Dispatcher.Dispatch(() =>+ {+ // Set the actual minimum and maximum size we want to allow.+ _window.MinimumWidth = _compactOverlayModeWindowState.MinWidth;+ _window.MinimumHeight = _compactOverlayModeWindowState.MinHeight;+ _window.MaximumWidth = _compactOverlayModeWindowState.MaxWidth;+ _window.MaximumHeight = _compactOverlayModeWindowState.MaxHeight;++ uiWindow.MoveWindow(+ x: _compactOverlayModeWindowState.Left,+ y: _compactOverlayModeWindowState.Top + _compactOverlayModeWindowState.Height); // On mac, the screen origin starts at the bottom.+ });+ }+ }+ else+ {+ // Save the state of the window while being in compact overlay mode.+ _compactOverlayModeWindowState+ = new(+ uiWindow.IsZoomed(),+ uiWindow.CoordinateSpace.Bounds.Height,+ uiWindow.CoordinateSpace.Bounds.Width,+ uiWindowPosition.Y,+ uiWindowPosition.X,+ _window.MaximumHeight,+ _window.MaximumWidth,+ _window.MinimumHeight,+ _window.MinimumWidth);++ // Restore the state of the window+ uiWindow.ToggleWindowAlwaysOnTop(alwaysOnTop: false);+ uiWindow.ToggleTitleBarButtons(hideButtons: false);+ if (_compactOverlayModeWindowState.IsZoomed)+ {+ uiWindow.ForceZoom();+ }++ Guard.IsNotNull(_nonCompactOverlayModeWindowState);++ // MacCatalyst doesn't support resizing programmatically. However a workaround to enable resizing is to set Minimum and Maximize size to the desired one.+ // https://learn.microsoft.com/en-us/dotnet/maui/fundamentals/windows#mac-catalyst+ _window.MinimumWidth = _nonCompactOverlayModeWindowState.Width;+ _window.MaximumWidth = _nonCompactOverlayModeWindowState.Width;+ _window.MinimumHeight = _nonCompactOverlayModeWindowState.Height;+ _window.MaximumHeight = _nonCompactOverlayModeWindowState.Height;++ // Give the Window time to resize+ _window.Dispatcher.Dispatch(() =>+ {+ // Set the actual minimum and maximum size we want to allow.+ _window.MinimumWidth = _nonCompactOverlayModeWindowState.MinWidth;+ _window.MinimumHeight = _nonCompactOverlayModeWindowState.MinHeight;+ _window.MaximumWidth = _nonCompactOverlayModeWindowState.MaxWidth;+ _window.MaximumHeight = _nonCompactOverlayModeWindowState.MaxHeight;++ uiWindow.MoveWindow(+ x: _nonCompactOverlayModeWindowState.Left,+ y: _nonCompactOverlayModeWindowState.Top + _nonCompactOverlayModeWindowState.Height); // On mac, the screen origin starts at the bottom.+ });+ }+ }++ private void UpdateWindowTitle()+ {+ Guard.IsNotNull(_window);+ Guard.IsNotNull(_titleBarInfoProvider);+ if (_window.Handler is not null && _window.Handler.PlatformView is UIWindow uiWindow)+ {+ Guard.IsNotNull(uiWindow.WindowScene);+ uiWindow.WindowScene.Title = _titleBarInfoProvider.Title ?? string.Empty;+ }+ }++ private void TitleBarInfoProvider_PropertyChanged(object? sender, PropertyChangedEventArgs e)+ {+ if (e.PropertyName == nameof(TitleBarInfoProvider.Title))+ {+ UpdateWindowTitle();+ }}public void OnWindowActivated(NSNotification notification)diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/WindowStateBackup.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/WindowStateBackup.csnew file mode 100644index 000000000..9d334a121--- /dev/null+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/WindowStateBackup.cs@@ -0,0 +1,15 @@+namespace DevToys.MacOS.Core;++internal record WindowStateBackup(+ bool IsZoomed,+ double Height,+ double Width,+ double Top,+ double Left,+ double MaxHeight,+ double MaxWidth,+ double MinHeight,+ double MinWidth)+{+}+diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/MauiProgram.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/MauiProgram.csindex 68b6b2af7..0f41f334c 100644--- a/src/app/dev/platforms/desktop/DevToys.MacOS/MauiProgram.cs+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/MauiProgram.cs@@ -15,9 +15,12 @@ namespace DevToys.MacOS;public partial class MauiProgram{+ private readonly WindowService _windowService = new();private ILogger? _logger;private MauiApp? _app;+ internal static ServiceProvider? ServiceProvider;+internal static MefComposer? MefComposer;public MauiApp CreateMauiApp()@@ -33,7 +36,7 @@ public partial class MauiProgrambuilder.UseMauiCommunityToolkit();// Initialize services and logging.- ServiceProvider serviceProvider = InitializeServices(builder.Services);+ ServiceProvider = InitializeServices(builder.Services);// Listen for unhandled exceptions.AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;@@ -102,7 +105,7 @@ public partial class MauiProgram});serviceCollection.AddSingleton(provider => MefComposer!.Provider);- serviceCollection.AddSingleton<IWindowService, WindowService>();+ serviceCollection.AddSingleton<IWindowService>(provider => _windowService);serviceCollection.AddScoped<PopoverService, PopoverService>();serviceCollection.AddScoped<ContextMenuService, ContextMenuService>();serviceCollection.AddScoped<FontService, FontService>();diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/Platforms/MacCatalyst/Info.plist b/src/app/dev/platforms/desktop/DevToys.MacOS/Platforms/MacCatalyst/Info.plistindex 8ce08a724..36a61c84a 100644--- a/src/app/dev/platforms/desktop/DevToys.MacOS/Platforms/MacCatalyst/Info.plist+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/Platforms/MacCatalyst/Info.plist@@ -31,5 +31,14 @@</array><key>XSAppIconAssets</key><string>Assets.xcassets/appicon.appiconset</string>++ <key>CFBundleDisplayName</key>+ <string>DevToys</string>++ <key>CFBundleName</key>+ <string>DevToys</string>++ <key>CFBundleSpokenName</key>+ <string>Dev Toys</string></dict></plist>diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/Platforms/MacCatalyst/UIKitExtensions.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/Platforms/MacCatalyst/UIKitExtensions.csnew file mode 100644index 000000000..53f548211--- /dev/null+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/Platforms/MacCatalyst/UIKitExtensions.cs@@ -0,0 +1,225 @@+using CoreGraphics;+using System.Runtime.InteropServices;+using Foundation;+using ObjCRuntime;+using UIKit;+using Microsoft.Maui.Controls;+using Microsoft.Maui.Devices.Sensors;+using System.Drawing;++namespace DevToys.MacOS;++/// <summary>+/// UIKit Extensions+/// </summary>+internal static class UIKitExtensions+{+ /// <summary>+ /// NSWindowLevel.Status+ /// </summary>+ private const int NSWindowLevel_Status = 9;++ /// <summary>+ /// NSWindowLevel.Base+ /// </summary>+ private const int NSWindowLevel_Base = 0;++ private static readonly ulong CloseButton = 0;+ private static readonly ulong MiniaturizeButton = 1;+ private static readonly ulong ZoomButton = 2;++ [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]+ private static extern IntPtr IntPtr_objc_msgSend_nfloat(IntPtr receiver, IntPtr selector, NFloat arg1);++ [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]+ private static extern IntPtr IntPtr_objc_msgSend_IntPtr(IntPtr receiver, IntPtr selector, IntPtr arg1);++ [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]+ private static extern IntPtr IntPtr_objc_msgSend_UInt64(IntPtr receiver, IntPtr selector, ulong arg1);++ [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]+ private static extern IntPtr IntPtr_objc_msgSend(IntPtr receiver, IntPtr selector);++ [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]+ private static extern void void_objc_msgSend_IntPtr(IntPtr receiver, IntPtr selector, IntPtr arg1);++ [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]+ private static extern void void_objc_msgSend_bool_IntPtr(IntPtr receiver, IntPtr selector, bool arg1, IntPtr arg2);++ [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]+ private static extern void void_objc_msgSend_IntPtr_IntPtr(IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2);++ [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]+ private static extern void void_objc_msgSend_IntPtr_bool(IntPtr receiver, IntPtr selector, IntPtr arg1, bool arg2);++ [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]+ private static extern void void_objc_msgSend_IntPtr_bool_bool(IntPtr receiver, IntPtr selector, IntPtr arg1, bool arg2, bool arg3);++ [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]+ private static extern void void_objc_msgSend_bool(IntPtr receiver, IntPtr selector, bool arg1);++ [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]+ private static extern void void_objc_msgSend_ulong(IntPtr receiver, IntPtr selector, ulong arg1);++ [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]+ private static extern void void_objc_msgSend_Int64(IntPtr receiver, IntPtr selector, long arg1);++ [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]+ private static extern void void_objc_msgSend_CGPoint(IntPtr receiver, IntPtr selector, CGPoint arg1);++ [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]+ private static extern CGRect RectangleF_objc_msgSend_stret(IntPtr receiver, IntPtr selector);++ internal static bool IsZoomed(this UIWindow window)+ {+ var nsWindow = window.GetNSWindowFromUIWindow();+ if (nsWindow is null)+ {+ return false;+ }++ return IntPtr_objc_msgSend(nsWindow.Handle, Selector.GetHandle("isZoomed")) != IntPtr.Zero;+ }++ internal static void ForceUnzoom(this UIWindow window)+ {+ if (IsZoomed(window))+ {+ var nsWindow = window.GetNSWindowFromUIWindow();+ if (nsWindow is null)+ {+ return;+ }++ void_objc_msgSend_IntPtr(nsWindow.Handle, Selector.GetHandle("zoom:"), nsWindow.Handle);+ }+ }++ internal static void ForceZoom(this UIWindow window)+ {+ if (!IsZoomed(window))+ {+ var nsWindow = window.GetNSWindowFromUIWindow();+ if (nsWindow is null)+ {+ return;+ }++ void_objc_msgSend_IntPtr(nsWindow.Handle, Selector.GetHandle("zoom:"), nsWindow.Handle);+ }+ }++ internal static void MoveWindow(this UIWindow window, double x, double y)+ {+ var nsWindow = window.GetNSWindowFromUIWindow();+ if (nsWindow is null)+ {+ return;+ }++ void_objc_msgSend_CGPoint(nsWindow.Handle, Selector.GetHandle("setFrameTopLeftPoint:"), new CGPoint(x, y));+ }++ internal static CGPoint GetWindowPosition(this UIWindow window)+ {+ var nsWindow = window.GetNSWindowFromUIWindow();+ if (nsWindow is null)+ {+ return CGPoint.Empty;+ }++ return RectangleF_objc_msgSend_stret(nsWindow.Handle, Selector.GetHandle("frame")).Location;+ }++ internal static void ToggleWindowAlwaysOnTop(this UIWindow window, bool alwaysOnTop)+ {+ var nsWindow = window.GetNSWindowFromUIWindow();+ if (nsWindow is null)+ {+ return;+ }++ if (alwaysOnTop)+ {+ void_objc_msgSend_Int64(nsWindow.Handle, Selector.GetHandle("setLevel:"), NSWindowLevel_Status);+ }+ else+ {+ void_objc_msgSend_Int64(nsWindow.Handle, Selector.GetHandle("setLevel:"), NSWindowLevel_Base);+ }+ }++ internal static void ToggleTitleBarButtons(this UIWindow window, bool hideButtons)+ {+ var nsWindow = window.GetNSWindowFromUIWindow();+ if (nsWindow is null)+ {+ return;+ }++ var closeButton = Runtime.GetNSObject(IntPtr_objc_msgSend_UInt64(nsWindow.Handle, Selector.GetHandle("standardWindowButton:"), CloseButton));++ if (closeButton is null)+ {+ return;+ }++ var miniaturizeButton = Runtime.GetNSObject(IntPtr_objc_msgSend_UInt64(nsWindow.Handle, Selector.GetHandle("standardWindowButton:"), MiniaturizeButton));+ if (miniaturizeButton is null)+ {+ return;+ }++ var zoomButton = Runtime.GetNSObject(IntPtr_objc_msgSend_UInt64(nsWindow.Handle, Selector.GetHandle("standardWindowButton:"), ZoomButton));++ if (zoomButton is null)+ {+ return;+ }++ //void_objc_msgSend_bool(closeButton.Handle, Selector.GetHandle("setHidden:"), hideButtons);+ void_objc_msgSend_bool(miniaturizeButton.Handle, Selector.GetHandle("setHidden:"), hideButtons);+ void_objc_msgSend_bool(zoomButton.Handle, Selector.GetHandle("setHidden:"), hideButtons);+ }++ private static NSObject? GetNSWindowFromUIWindow(this UIWindow window)+ {+ if (window is null)+ {+ return null;+ }++ var sharedApplication = GetNSApplicationSharedApplication();++ var applicationDelegate = sharedApplication?.PerformSelector(new Selector("delegate"));+ if (applicationDelegate is null)+ {+ return null;+ }++ return GetNSWindow(window, applicationDelegate);+ }++ private static NSObject? GetNSWindow(UIWindow window, NSObject applicationDelegate)+ {+ var nsWindowHandle = IntPtr_objc_msgSend_IntPtr(applicationDelegate.Handle, Selector.GetHandle("hostWindowForUIWindow:"), window.Handle);+ var nsWindow = Runtime.GetNSObject<NSObject>(nsWindowHandle);+ if (nsWindow is null)+ {+ return GetNSWindow(window, applicationDelegate);+ }++ return nsWindow;+ }++ private static NSObject? GetNSApplicationSharedApplication()+ {+ var nsapp = Runtime.GetNSObject(Class.GetHandle("NSApplication"));+ if (nsapp is null)+ {+ return null;+ }++ return nsapp.PerformSelector(new Selector("sharedApplication"));+ }+}\ No newline at end of file