A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Disabled Compact overlay mode on Mac
Etienne Baudoux9470a4cee6be
diff --git a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.js b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.jsindex 5a41f5cb7..1adefb3bc 100644--- a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.js+++ b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.js@@ -12,7 +12,7 @@ export function registerKeyboardShortcut(id, dotNetObjRef) {const navBar = document.getElementById(id);navBar.addEventListener("keydown", function onPress(event) {// Ctrl + F- if (event.ctrlKey && event.key === "f") {+ if ((event.ctrlKey || event.metaKey) && event.key === "f") {event.preventDefault();dotNetObjRef.invokeMethodAsync("OnFindRequested");}diff --git a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.ts b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.tsindex 4264c9e72..e4fdef0c3 100644--- a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.ts+++ b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.ts@@ -16,7 +16,7 @@ export function registerKeyboardShortcut(id: string, dotNetObjRef: DotNet.DotNetnavBar.addEventListener("keydown", function onPress(event) {// Ctrl + F- if (event.ctrlKey && event.key === "f") {+ if ((event.ctrlKey || event.metaKey) && event.key === "f") {event.preventDefault();dotNetObjRef.invokeMethodAsync("OnFindRequested");}diff --git a/src/app/dev/DevToys.Blazor/Core/Services/IWindowService.cs b/src/app/dev/DevToys.Blazor/Core/Services/IWindowService.csindex 07417ebcc..30eb84c66 100644--- a/src/app/dev/DevToys.Blazor/Core/Services/IWindowService.cs+++ b/src/app/dev/DevToys.Blazor/Core/Services/IWindowService.cs@@ -15,4 +15,6 @@ public interface IWindowServiceevent EventHandler<EventArgs>? IsCompactOverlayModeChanged;bool IsCompactOverlayMode { get; set; }++ bool IsCompactOverlayModeSupportedByPlatform { get; }}diff --git a/src/app/dev/DevToys.Blazor/Pages/Index.razor b/src/app/dev/DevToys.Blazor/Pages/Index.razorindex fabf071be..6db81ef62 100644--- a/src/app/dev/DevToys.Blazor/Pages/Index.razor+++ b/src/app/dev/DevToys.Blazor/Pages/Index.razor@@ -57,6 +57,7 @@<Button Appearance="ButtonAppearance.Stealth"Height="32"IsEnabled="@compactOverlayModeAllowed"+ IsVisible="@WindowService.IsCompactOverlayModeSupportedByPlatform"ToolTip="Picture in picture"@onclick="@OnToggleCompactOverlayModeButtonClick"><FontIcon Glyph="@(WindowService.IsCompactOverlayMode ? '\uE97C' : '\uE97F')" />diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/WindowService.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/WindowService.csindex 683d20798..ba74fc430 100644--- a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/WindowService.cs+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/WindowService.cs@@ -5,6 +5,8 @@ namespace DevToys.MacOS.Core;internal sealed class WindowService : IWindowService{+ private bool _isCompactOverlayMode;+public event EventHandler<EventArgs>? WindowActivated;public event EventHandler<EventArgs>? WindowDeactivated;public event EventHandler<EventArgs>? WindowLocationChanged;@@ -21,7 +23,24 @@ internal sealed class WindowService : IWindowServiceNSNotificationCenter.DefaultCenter.AddObserver(new NSString("NSWindowWillCloseNotification"), OnWindowClosing);}- public bool IsCompactOverlayMode { get; set; }+ // TODO: support Picture-in-Picture mode or mock it.+ public bool IsCompactOverlayModeSupportedByPlatform => false;++ public bool IsCompactOverlayMode+ {+ get => _isCompactOverlayMode;+ set+ {+ _isCompactOverlayMode = value;+ UpdateCompactOverlayState(value);+ IsCompactOverlayModeChanged?.Invoke(this, EventArgs.Empty);+ }+ }++ private void UpdateCompactOverlayState(bool shouldEnterCompactOverlayMode)+ {++ }public void OnWindowActivated(NSNotification notification){diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Core/WindowService.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/WindowService.csindex 21b0c18d2..2a3d898ff 100644--- a/src/app/dev/platforms/desktop/DevToys.Windows/Core/WindowService.cs+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/WindowService.cs@@ -20,6 +20,8 @@ internal sealed class WindowService : IWindowServicepublic event EventHandler<EventArgs>? WindowClosing;public event EventHandler<EventArgs>? IsCompactOverlayModeChanged;+ public bool IsCompactOverlayModeSupportedByPlatform => true;+public bool IsCompactOverlayMode{get => _isCompactOverlayMode;