Skip to content

A Swiss Army knife for developers.

Added Compact Overlay support on Windows

Etienne Baudoux665318fa0dc3
diff --git a/src/app/dev/DevToys.Api/Tool/Metadata/Attributes/CompactOverlaySizeAttribute.cs b/src/app/dev/DevToys.Api/Tool/Metadata/Attributes/CompactOverlaySizeAttribute.cs
deleted file mode 100644
index 40d43ef5e..000000000
--- a/src/app/dev/DevToys.Api/Tool/Metadata/Attributes/CompactOverlaySizeAttribute.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace DevToys.Api;
-
-/// <summary>
-/// Indicates the size that the window should take in Compact Overlay mode when this <see cref="IGuiTool"/> is active.
-/// </summary>
-[MetadataAttribute]
-[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
-public sealed class CompactOverlaySizeAttribute : Attribute
-{
- public int? CompactOverlayHeight { get; set; }
-
- public int? CompactOverlayWidth { get; set; }
-
- public CompactOverlaySizeAttribute(int height, int width)
- {
- CompactOverlayHeight = height;
- CompactOverlayWidth = width;
- }
-}
diff --git a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor
index 0f8cdb606..7ee3c59a3 100644
--- a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor
+++ b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor
@@ -15,49 +15,61 @@
<!-- Header -->
<div class="nav-bar-header">
- <StackPanel Orientation="UIOrientation.Horizontal"
- HorizontalAlignment="UIHorizontalAlignment.Left">
- <Button Appearance="ButtonAppearance.Stealth"
- Class="nav-bar-button-icon"
- Height="36"
- Width="40"
- MarginTop="5"
- MarginRight="0"
- MarginBottom="0"
- MarginLeft="5"
- IsEnabled="@CanGoBack"
- title="Back"
- aria-label="Back"
- @onclick="OnBackButtonClicked">
- <FontIcon Glyph="@('\uF15B')" />
- </Button>
- <Button Appearance="ButtonAppearance.Stealth"
- Class="nav-bar-button-icon"
- Height="36"
- Width="40"
- MarginTop="5"
- MarginRight="0"
- MarginBottom="0"
- MarginLeft="0"
- IsVisible="@_sidebarState.IsHidden"
- title="Toggle Navigation"
- aria-label="Toggle Navigation"
- aria-controls="@NavId"
- aria-expanded="@_sidebarState.IsCollapsed"
- @onclick="OnToggleSidebarClick">
- <FontIcon Glyph="@('\uE85F')" />
- </Button>
+ <Grid ColumnSpacing="8"
+ Columns="@(new List<UIGridLength>
+ {
+ new UIGridLength(1, UIGridUnitType.Fraction),
+ UIGridLength.Auto
+ })">
+ <GridCell Column="0">
+ <StackPanel Orientation="UIOrientation.Horizontal"
+ HorizontalAlignment="UIHorizontalAlignment.Left">
+ <Button Appearance="ButtonAppearance.Stealth"
+ Class="nav-bar-button-icon"
+ Height="36"
+ Width="40"
+ MarginTop="5"
+ MarginRight="0"
+ MarginBottom="0"
+ MarginLeft="5"
+ IsEnabled="@CanGoBack"
+ IsVisible="@(!WindowService.IsCompactOverlayMode)"
+ title="Back"
+ aria-label="Back"
+ @onclick="OnBackButtonClicked">
+ <FontIcon Glyph="@('\uF15B')" />
+ </Button>
+ <Button Appearance="ButtonAppearance.Stealth"
+ Class="nav-bar-button-icon"
+ Height="36"
+ Width="40"
+ MarginTop="5"
+ MarginRight="0"
+ MarginBottom="0"
+ MarginLeft="0"
+ IsVisible="@(_sidebarState.IsHidden && !WindowService.IsCompactOverlayMode)"
+ title="Toggle Navigation"
+ aria-label="Toggle Navigation"
+ aria-controls="@NavId"
+ aria-expanded="@_sidebarState.IsCollapsed"
+ @onclick="OnToggleSidebarClick">
+ <FontIcon Glyph="@('\uE85F')" />
+ </Button>
- <div style="margin-left: 4px; display: inline;">
- @Header
- </div>
- </StackPanel>
+ <div style="margin-left: 4px; display: inline;">
+ @HeaderLeft
+ </div>
+ </StackPanel>
+ </GridCell>
+ <GridCell Column="1">
+ @HeaderRight
+ </GridCell>
+ </Grid>
</div>
<!-- Sidebar -->
<nav id="@NavId" class="@(_sidebarState.NavBarClassNames)">
- <StackPanel Class="sidebar-header"
- Orientation="UIOrientation.Vertical">
+ <div class="sidebar-header">
@* TODO: Localize *@
<Button Appearance="ButtonAppearance.Stealth"
Class="nav-bar-button-icon"
@@ -104,7 +116,7 @@
Items="@SearchResultItems"
ItemTemplate="@SearchResultItemTemplate">
</AutoSuggestBox>
- </StackPanel>
+ </div>
<div class="sidebar-body">
<ScrollViewer Orientation="UIOrientation.Vertical">
<ul class="sidebar-items" role="listbox">
diff --git a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.cs b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.cs
index f1a3868e6..792eb8e6e 100644
--- a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.cs
@@ -1,4 +1,5 @@
using System.Collections.ObjectModel;
+using DevToys.Blazor.Core.Services;
using Microsoft.AspNetCore.Components.Web;
namespace DevToys.Blazor.Components;
@@ -58,10 +59,16 @@ public partial class NavBar<TElement, TSearchElement>
public RenderFragment? Content { get; set; }
/// <summary>
- /// Gets or sets the header to be rendered inside the component.
+ /// Gets or sets the header to be rendered inside the component, to the left.
/// </summary>
[Parameter]
- public RenderFragment? Header { get; set; }
+ public RenderFragment? HeaderLeft { get; set; }
+
+ /// <summary>
+ /// Gets or sets the header to be rendered inside the component, to the right.
+ /// </summary>
+ [Parameter]
+ public RenderFragment? HeaderRight { get; set; }
/// <summary>
/// Raised when the NavBar goes and leave the hidden state.
@@ -99,6 +106,14 @@ public partial class NavBar<TElement, TSearchElement>
[Parameter]
public RenderFragment<TSearchElement> SearchResultItemTemplate { get; set; } = default!;
+ /// <summary>
+ /// Gets whether the <see cref="NavBar{TElement, TSearchElement}"/>'s side bar is hidden or not.
+ /// </summary>
+ public bool IsHiddenMode => _sidebarState.IsHidden;
+
+ [Inject]
+ internal IWindowService WindowService { get; set; } = default!;
+
public NavBar()
{
_sidebarState.IsHiddenChanged += SidebarState_IsHiddenChanged;
@@ -106,7 +121,7 @@ public partial class NavBar<TElement, TSearchElement>
internal ValueTask<bool> TryFocusSearchBoxAsync()
{
- if (!_sidebarState.IsCollapsed && !_sidebarState.IsHidden)
+ if (!WindowService.IsCompactOverlayMode && !_sidebarState.IsCollapsed && !_sidebarState.IsHidden)
{
return _autoSuggestBox.FocusAsync();
}
@@ -152,6 +167,11 @@ public partial class NavBar<TElement, TSearchElement>
private void OnToggleSidebarClick()
{
+ if (WindowService.IsCompactOverlayMode)
+ {
+ return;
+ }
+
_sidebarState.ToggleSidebar();
}
@@ -162,6 +182,11 @@ public partial class NavBar<TElement, TSearchElement>
private void OnSearchButtonClick()
{
+ if (WindowService.IsCompactOverlayMode)
+ {
+ return;
+ }
+
_sidebarState.ForceExpand();
Task.Delay(200)
.ContinueWith(t =>
diff --git a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.scss b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.scss
index 2f04cdace..3bcbbc931 100644
--- a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.scss
+++ b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.scss
@@ -83,6 +83,8 @@ $sidebar-top-bar-height: 48px;
.sidebar-header {
grid-area: sidebar-header;
+ display: block;
+ width: 100%;
}
.sidebar-body {
diff --git a/src/app/dev/DevToys.Blazor/Core/Services/IWindowService.cs b/src/app/dev/DevToys.Blazor/Core/Services/IWindowService.cs
index d1bc8610b..07417ebcc 100644
--- a/src/app/dev/DevToys.Blazor/Core/Services/IWindowService.cs
+++ b/src/app/dev/DevToys.Blazor/Core/Services/IWindowService.cs
@@ -12,5 +12,7 @@ public interface IWindowService
event EventHandler<EventArgs>? WindowClosing;
- bool IsOverlayMode { get; set; }
+ event EventHandler<EventArgs>? IsCompactOverlayModeChanged;
+
+ bool IsCompactOverlayMode { get; set; }
}
diff --git a/src/app/dev/DevToys.Blazor/Pages/Index.razor b/src/app/dev/DevToys.Blazor/Pages/Index.razor
index d9fade2b0..fabf071be 100644
--- a/src/app/dev/DevToys.Blazor/Pages/Index.razor
+++ b/src/app/dev/DevToys.Blazor/Pages/Index.razor
@@ -31,10 +31,39 @@
SearchQuerySubmitted="OnSearchQuerySubmitted"
SearchResultItems="ViewModel.SearchResults">
<!-- Header -->
- <Header>
- <TextBlock Text="DevToys" />
- </Header>
-
+ <HeaderLeft>
+ @if (ViewModel.SelectedMenuItem is GuiToolViewItem guiToolViewItem && WindowService.IsCompactOverlayMode)
+ {
+ TitleBarInfoProvider.Title = "DevToys - " + guiToolViewItem.ToolInstance.LongOrShortDisplayTitle;
+ <TextBlock Text="@TitleBarInfoProvider.Title"
+ Style="margin-left: 16px;"/>
+ }
+ else
+ {
+ TitleBarInfoProvider.Title = "DevToys";
+ <TextBlock Text="@TitleBarInfoProvider.Title" />
+ }
+ </HeaderLeft>
+ <HeaderRight>
+ <StackPanel MarginRight="@TitleBarInfoProvider.TitleBarWindowStateButtonsWidth"
+ VerticalAlignment="UIVerticalAlignment.Top"
+ Orientation="UIOrientation.Horizontal"
+ Spacing="6">
+ @{
+ bool compactOverlayModeAllowed
+ = ViewModel.SelectedMenuItem is GuiToolViewItem guiToolViewItem
+ && !guiToolViewItem.ToolInstance.NoCompactOverlaySupport;
+ }
+ <Button Appearance="ButtonAppearance.Stealth"
+ Height="32"
+ IsEnabled="@compactOverlayModeAllowed"
+ ToolTip="Picture in picture"
+ @onclick="@OnToggleCompactOverlayModeButtonClick">
+ <FontIcon Glyph="@(WindowService.IsCompactOverlayMode ? '\uE97C' : '\uE97F')" />
+ </Button>
+ </StackPanel>
+ </HeaderRight>
+
<!-- Search box's result item design -->
<SearchResultItemTemplate Context="item">
<div class="sidebar-searchbar-result-item">
diff --git a/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs b/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs
index d1a95f6ed..64bcbe5ea 100644
--- a/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs
@@ -9,6 +9,7 @@ namespace DevToys.Blazor.Pages;
public partial class Index : MefComponentBase
{
+ private const int TitleBarMarginLeftWhenCompactOverlayMode = 0;
private const int TitleBarMarginLeftWhenNavBarHidden = 90;
private const int TitleBarMarginLeftWhenNavBarNotHidden = 47;
@@ -21,7 +22,7 @@ public partial class Index : MefComponentBase
internal GuiToolProvider GuiToolProvider { get; set; } = default!;
[Import]
- internal TitleBarMarginProvider TitleBarMarginProvider { get; set; } = default!;
+ internal TitleBarInfoProvider TitleBarInfoProvider { get; set; } = default!;
[Import]
internal IThemeListener ThemeListener { get; set; } = default!;
@@ -44,6 +45,9 @@ public partial class Index : MefComponentBase
ViewModel.SelectedMenuItem = ViewModel.HeaderAndBodyToolViewItems[0];
ContextMenuService.IsContextMenuOpenedChanged += ContextMenuService_IsContextMenuOpenedChanged;
WindowService.WindowActivated += WindowService_WindowActivated;
+ TitleBarInfoProvider.PropertyChanged += TitleBarMarginProvider_PropertyChanged;
+
+ TitleBarInfoProvider.TitleBarMarginRight = 40;
}
private void ViewModel_SelectedMenuItemChanged(object? sender, EventArgs e)
@@ -59,10 +63,15 @@ public partial class Index : MefComponentBase
StateHasChanged();
}
+ private void TitleBarMarginProvider_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+ {
+ StateHasChanged();
+ }
+
private void WindowService_WindowActivated(object? sender, EventArgs e)
{
// Start Smart Detection
- ViewModel.RunSmartDetectionAsync(WindowService.IsOverlayMode)
+ ViewModel.RunSmartDetectionAsync(WindowService.IsCompactOverlayMode)
.ContinueWith(async _ =>
{
await InvokeAsync(StateHasChanged);
@@ -74,15 +83,26 @@ public partial class Index : MefComponentBase
ViewModel.GoBack();
}
+ private void OnToggleCompactOverlayModeButtonClick()
+ {
+ WindowService.IsCompactOverlayMode = !WindowService.IsCompactOverlayMode;
+
+ OnHiddenStateChanged(_navBar.IsHiddenMode);
+ }
+
private void OnHiddenStateChanged(bool isHidden)
{
- if (isHidden)
+ if (WindowService.IsCompactOverlayMode)
+ {
+ TitleBarInfoProvider.TitleBarMarginLeft = TitleBarMarginLeftWhenCompactOverlayMode;
+ }
+ else if (isHidden)
{
- TitleBarMarginProvider.TitleBarMarginLeft = TitleBarMarginLeftWhenNavBarHidden;
+ TitleBarInfoProvider.TitleBarMarginLeft = TitleBarMarginLeftWhenNavBarHidden;
}
else
{
- TitleBarMarginProvider.TitleBarMarginLeft = TitleBarMarginLeftWhenNavBarNotHidden;
+ TitleBarInfoProvider.TitleBarMarginLeft = TitleBarMarginLeftWhenNavBarNotHidden;
}
}
@@ -105,7 +125,7 @@ public partial class Index : MefComponentBase
_navBar.TryFocusSearchBoxAsync();
// Start Smart Detection
- ViewModel.RunSmartDetectionAsync(WindowService.IsOverlayMode).Forget();
+ ViewModel.RunSmartDetectionAsync(WindowService.IsCompactOverlayMode).Forget();
}
if (IsTransitioning)
diff --git a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor
index ea16dc8a7..f227cd61c 100644
--- a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor
+++ b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor
@@ -26,9 +26,11 @@
<TextBlock Appearance="@TextBlockAppearance.Caption" Text="@item.Description" />
</div>
<div class="buttons" @onclick:stopPropagation="true">
+ <!-- TODO: Localize -->
<Button HorizontalAlignment="UIHorizontalAlignment.Right"
Class="button"
Appearance="@ButtonAppearance.Neutral"
+ ToolTip="Open in a new window"
@onclick="() => OnOpenInNewWindow(item)">
<FontIcon Class="fonticon" Glyph="@('\uEE7A')" />
</Button>
diff --git a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor
index 6d2748d2b..bb111af0c 100644
--- a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor
+++ b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor
@@ -28,13 +28,15 @@
})">
<GridCell Row="0" Column="0">
- <TextBlock Appearance="@TextBlockAppearance.Title"
+ <TextBlock IsVisible="@(!WindowService.IsCompactOverlayMode)"
+ Appearance="@TextBlockAppearance.Title"
Style="font-size: 24px !important"
Text="@ViewModel.HeaderText" />
</GridCell>
<GridCell Row="0"
Column="1">
- <StackPanel Wrap="false">
+ <StackPanel Wrap="false"
+ IsVisible="@(!WindowService.IsCompactOverlayMode)">
<Button IsVisible="@ViewModel.IsSelectedMenuItemSupportFavorite"
Appearance="ButtonAppearance.Stealth"
@onclick="@OnToggleFavorite">
diff --git a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor.cs b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor.cs
index b3b8cc74e..cc2644b21 100644
--- a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor.cs
@@ -1,4 +1,5 @@
using DevToys.Blazor.Components;
+using DevToys.Blazor.Core.Services;
using DevToys.Business.ViewModels;
using DevToys.Core.Tools.ViewItems;
@@ -6,6 +7,9 @@ namespace DevToys.Blazor.Pages.SubPages;
public partial class ToolPage : MefComponentBase, IDisposable
{
+ [Inject]
+ internal IWindowService WindowService { get; set; } = default!;
+
[Import]
internal ToolPageViewModel ViewModel { get; set; } = default!;
diff --git a/src/app/dev/DevToys.Core/TitleBarMarginProvider.cs b/src/app/dev/DevToys.Core/TitleBarMarginProvider.cs
index 4e5800a81..b4f928b4b 100644
--- a/src/app/dev/DevToys.Core/TitleBarMarginProvider.cs
+++ b/src/app/dev/DevToys.Core/TitleBarMarginProvider.cs
@@ -3,7 +3,7 @@
namespace DevToys.Core;
[Export]
-public sealed partial class TitleBarMarginProvider : ObservableObject
+public sealed partial class TitleBarInfoProvider : ObservableObject
{
/// <summary>
/// Gets or sets margin of the title bar on the left.
@@ -16,4 +16,16 @@ public sealed partial class TitleBarMarginProvider : ObservableObject
/// </summary>
[ObservableProperty]
private int _titleBarMarginRight = 0;
+
+ /// <summary>
+ /// Gets or sets the width of the window state buttons.
+ /// </summary>
+ [ObservableProperty]
+ private int _titleBarWindowStateButtonsWidth;
+
+ /// <summary>
+ /// Gets or sets the title to display in the window title bar.
+ /// </summary>
+ [ObservableProperty]
+ private string? _title;
}
diff --git a/src/app/dev/DevToys.Core/Tools/GuiToolInstance.cs b/src/app/dev/DevToys.Core/Tools/GuiToolInstance.cs
index 4c8c3a37b..629302c26 100644
--- a/src/app/dev/DevToys.Core/Tools/GuiToolInstance.cs
+++ b/src/app/dev/DevToys.Core/Tools/GuiToolInstance.cs
@@ -69,10 +69,6 @@ public sealed partial class GuiToolInstance : ObservableObject
public bool NoCompactOverlaySupport => _guiToolDefinition.Metadata.NoCompactOverlaySupport;
- public int? CompactOverlayHeight => _guiToolDefinition.Metadata.CompactOverlayHeight;
-
- public int? CompactOverlayWidth => _guiToolDefinition.Metadata.CompactOverlayWidth;
-
public string GroupName => _guiToolDefinition.Metadata.GroupName;
public bool IsFooterTool => _guiToolDefinition.Metadata.MenuPlacement == MenuPlacement.Footer;
diff --git a/src/app/dev/DevToys.Core/Tools/Metadata/GuiToolMetadata.cs b/src/app/dev/DevToys.Core/Tools/Metadata/GuiToolMetadata.cs
index f73a427ab..3db3219d7 100644
--- a/src/app/dev/DevToys.Core/Tools/Metadata/GuiToolMetadata.cs
+++ b/src/app/dev/DevToys.Core/Tools/Metadata/GuiToolMetadata.cs
@@ -49,8 +49,6 @@ public sealed class GuiToolMetadata : IOrderableMetadata
NotFavorable = metadata.GetValueOrDefault(nameof(NotFavorableAttribute.NotFavorable)) as bool? ?? false;
NoCompactOverlaySupport = metadata.GetValueOrDefault(nameof(NoCompactOverlaySupportAttribute.NoCompactOverlaySupport)) as bool? ?? false;
MenuPlacement = metadata.GetValueOrDefault(nameof(MenuPlacementAttribute.MenuPlacement)) as MenuPlacement?;
- CompactOverlayHeight = metadata.GetValueOrDefault(nameof(CompactOverlaySizeAttribute.CompactOverlayHeight)) as int?;
- CompactOverlayWidth = metadata.GetValueOrDefault(nameof(CompactOverlaySizeAttribute.CompactOverlayWidth)) as int?;
TargetPlatforms = metadata.GetValueOrDefault(nameof(TargetPlatformAttribute.TargetPlatform)) as IReadOnlyList<Platform> ?? Array.Empty<Platform>();
AcceptedDataTypeNames = metadata.GetValueOrDefault(nameof(AcceptedDataTypeNameAttribute.DataTypeName)) as IReadOnlyList<string> ?? Array.Empty<string>();
Guard.IsNotNullOrWhiteSpace(InternalComponentName);
@@ -137,10 +135,6 @@ public sealed class GuiToolMetadata : IOrderableMetadata
public MenuPlacement? MenuPlacement { get; }
- public int? CompactOverlayHeight { get; }
-
- public int? CompactOverlayWidth { get; }
-
public IReadOnlyList<Platform> TargetPlatforms { get; }
public IReadOnlyList<string> AcceptedDataTypeNames { get; }
diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/WindowService.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/WindowService.cs
index d49b8a02a..683d20798 100644
--- a/src/app/dev/platforms/desktop/DevToys.MacOS/Core/WindowService.cs
+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/Core/WindowService.cs
@@ -10,8 +10,7 @@ internal sealed class WindowService : IWindowService
public event EventHandler<EventArgs>? WindowLocationChanged;
public event EventHandler<EventArgs>? WindowSizeChanged;
public event EventHandler<EventArgs>? WindowClosing;
-
- public bool IsOverlayMode { get; set; }
+ public event EventHandler<EventArgs>? IsCompactOverlayModeChanged;
public WindowService()
{
@@ -22,6 +21,8 @@ internal sealed class WindowService : IWindowService
NSNotificationCenter.DefaultCenter.AddObserver(new NSString("NSWindowWillCloseNotification"), OnWindowClosing);
}
+ public bool IsCompactOverlayMode { get; set; }
+
public void OnWindowActivated(NSNotification notification)
{
WindowActivated?.Invoke(this, EventArgs.Empty);
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml
index dda9ad09b..439302773 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml
@@ -118,6 +118,7 @@
Grid.Column="1"
Background="{DynamicResource FakeTransparentColor}"/>
<StackPanel
+ x:Name="WindowStateButtonsStackPanel"
Grid.Column="3"
Orientation="Horizontal">
<Button
@@ -209,6 +210,11 @@
<Setter TargetName="MaximizeButton" Property="Visibility" Value="Visible" />
<Setter TargetName="RestoreButton" Property="Visibility" Value="Collapsed" />
</Trigger>
+ <Trigger Property="ForbidMinimizeAndMaximize" Value="True">
+ <Setter TargetName="MaximizeButton" Property="Visibility" Value="Collapsed" />
+ <Setter TargetName="RestoreButton" Property="Visibility" Value="Collapsed" />
+ <Setter TargetName="MinimizeButton" Property="Visibility" Value="Collapsed" />
+ </Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.cs
index bfe453fb9..b32cef2c0 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.cs
@@ -8,6 +8,7 @@ using System.Windows.Media;
using System.Windows.Shell;
using DevToys.Api;
using DevToys.Windows.Core;
+using DevToys.Windows.Core.Helpers;
using DevToys.Windows.Native;
using Windows.Win32;
using Windows.Win32.Foundation;
@@ -29,6 +30,8 @@ public abstract partial class MicaWindowWithOverlay : Window
protected EfficiencyModeService? _efficiencyModeService;
private Button? _restoreButton;
private Button? _maximizeButton;
+ private Button? _minimizeButton;
+ private StackPanel? _windowStateButtonsStackPanel;
protected MicaWindowWithOverlay()
{
@@ -69,6 +72,18 @@ public abstract partial class MicaWindowWithOverlay : Window
set => SetValue(TitleBarMarginRightProperty, value);
}
+ internal static readonly DependencyProperty TitleBarWindowStateButtonsWidthProperty
+ = DependencyProperty.Register(
+ nameof(TitleBarWindowStateButtonsWidth),
+ typeof(int),
+ typeof(MicaWindowWithOverlay));
+
+ internal int TitleBarWindowStateButtonsWidth
+ {
+ get => (int)GetValue(TitleBarWindowStateButtonsWidthProperty);
+ set => SetValue(TitleBarWindowStateButtonsWidthProperty, value);
+ }
+
internal static readonly DependencyProperty MarginMaximizedProperty
= DependencyProperty.Register(
nameof(MarginMaximized),
@@ -81,19 +96,34 @@ public abstract partial class MicaWindowWithOverlay : Window
set => SetValue(MarginMaximizedProperty, value);
}
+ internal static readonly DependencyProperty ForbidMinimizeAndMaximizeProperty
+ = DependencyProperty.Register(
+ nameof(ForbidMinimizeAndMaximize),
+ typeof(bool),
+ typeof(MicaWindowWithOverlay),
+ new PropertyMetadata(OnForbidMinimizeAndMaximizePropertyChangedCallback));
+
+ internal bool ForbidMinimizeAndMaximize
+ {
+ get => (bool)GetValue(ForbidMinimizeAndMaximizeProperty);
+ set => SetValue(ForbidMinimizeAndMaximizeProperty, value);
+ }
+
public override void OnApplyTemplate()
{
base.OnApplyTemplate();
+ _windowStateButtonsStackPanel = (StackPanel)Template.FindName("WindowStateButtonsStackPanel", this);
var closeButton = (Button)Template.FindName("CloseButton", this);
- var minimizeButton = (Button)Template.FindName("MinimizeButton", this);
+ _minimizeButton = (Button)Template.FindName("MinimizeButton", this);
_restoreButton = (Button)Template.FindName("RestoreButton", this);
_maximizeButton = (Button)Template.FindName("MaximizeButton", this);
var draggableTitleBarArea = (Border)Template.FindName("DraggableTitleBarArea", this);
var overlayControl = (OverlayControl)Template.FindName("TitleBar", this);
+ _windowStateButtonsStackPanel.SizeChanged += WindowStateButtonsStackPanel_SizeChanged;
closeButton.Click += CloseButton_Click;
- minimizeButton.Click += MinimizeButton_Click;
+ _minimizeButton.Click += MinimizeButton_Click;
_restoreButton.Click += RestoreButton_Click;
_maximizeButton.Click += MaximizeButton_Click;
draggableTitleBarArea.MouseLeftButtonDown += DraggableTitleBarArea_MouseLeftButtonDown;
@@ -147,6 +177,12 @@ public abstract partial class MicaWindowWithOverlay : Window
}
}
+ private void WindowStateButtonsStackPanel_SizeChanged(object sender, SizeChangedEventArgs e)
+ {
+ Guard.IsNotNull(_windowStateButtonsStackPanel);
+ TitleBarWindowStateButtonsWidth = (int)_windowStateButtonsStackPanel.ActualWidth;
+ }
+
private void CloseButton_Click(object sender, RoutedEventArgs e)
{
SystemCommands.CloseWindow(this);
@@ -171,14 +207,17 @@ public abstract partial class MicaWindowWithOverlay : Window
{
if (e.ClickCount == 2)
{
- // Toggle Maximize / Normal state.
- if (WindowState == WindowState.Maximized)
- {
- SystemCommands.RestoreWindow(this);
- }
- else
+ if (!ForbidMinimizeAndMaximize)
{
- SystemCommands.MaximizeWindow(this);
+ // Toggle Maximize / Normal state.
+ if (WindowState == WindowState.Maximized)
+ {
+ SystemCommands.RestoreWindow(this);
+ }
+ else
+ {
+ SystemCommands.MaximizeWindow(this);
+ }
}
}
else
@@ -369,7 +408,8 @@ public abstract partial class MicaWindowWithOverlay : Window
short x = (short)(lParam.ToInt32() & 0xffff);
int y = lParam.ToInt32() >> 16;
var point = new Point(x, y);
- double DPI_SCALE = DpiHelper.LogicalToDeviceUnitsScalingFactorX;
+ var dpiHelper = new DpiHelper(this);
+ double DPI_SCALE = dpiHelper.LogicalToDeviceUnitsScalingFactorX;
Button? button = WindowState == WindowState.Maximized ? _restoreButton : _maximizeButton;
Guard.IsNotNull(button);
@@ -402,7 +442,8 @@ public abstract partial class MicaWindowWithOverlay : Window
int x = lParam.ToInt32() & 0xffff;
int y = lParam.ToInt32() >> 16;
- double DPI_SCALE = DpiHelper.LogicalToDeviceUnitsScalingFactorX;
+ var dpiHelper = new DpiHelper(this);
+ double DPI_SCALE = dpiHelper.LogicalToDeviceUnitsScalingFactorX;
Button? button = WindowState == WindowState.Maximized ? _restoreButton : _maximizeButton;
Guard.IsNotNull(button);
@@ -423,4 +464,18 @@ public abstract partial class MicaWindowWithOverlay : Window
var invokeProv = new ButtonAutomationPeer(button).GetPattern(PatternInterface.Invoke) as IInvokeProvider;
invokeProv?.Invoke();
}
+
+ private static void OnForbidMinimizeAndMaximizePropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ var window = (MicaWindowWithOverlay)d;
+ var windowHandle = new HWND(new WindowInteropHelper(window).EnsureHandle());
+ if (window.ForbidMinimizeAndMaximize)
+ {
+ NativeMethods.DisableMinimizeAndMaximizeCapabilities(windowHandle);
+ }
+ else
+ {
+ NativeMethods.EnableMinimizeAndMaximizeCapabilities(windowHandle);
+ }
+ }
}
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Native/DpiHelper.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/Helpers/DpiHelper.cs
similarity index 69%
rename from src/app/dev/platforms/desktop/DevToys.Windows/Native/DpiHelper.cs
rename to src/app/dev/platforms/desktop/DevToys.Windows/Core/Helpers/DpiHelper.cs
index b0bc15c9d..2034a9e5f 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Native/DpiHelper.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/Helpers/DpiHelper.cs
@@ -1,21 +1,24 @@
-using System.Windows.Media;
+using System.Windows;
+using System.Windows.Interop;
+using System.Windows.Media;
using Windows.Win32;
using Windows.Win32.Foundation;
using Windows.Win32.Graphics.Gdi;
-namespace DevToys.Windows.Native;
+namespace DevToys.Windows.Core.Helpers;
/// <summary>
/// An helper class to help with DPI.
/// </summary>
-public static class DpiHelper
+internal sealed class DpiHelper
{
private const double LogicalDpi = 96.0;
- static DpiHelper()
+ internal DpiHelper(Window window)
{
#pragma warning disable CA1416 // Validate platform compatibility
- HDC dC = PInvoke.GetDC(HWND.Null);
+ var windowInteropHelper = new WindowInteropHelper(window);
+ HDC dC = PInvoke.GetDC(new HWND(windowInteropHelper.Handle));
if (dC != nint.Zero)
{
_ = DeviceDpiX = PInvoke.GetDeviceCaps(dC, GET_DEVICE_CAPS_INDEX.LOGPIXELSX);
@@ -42,30 +45,30 @@ public static class DpiHelper
/// <summary>
/// The current device.
/// </summary>
- public static MatrixTransform TransformFromDevice { get; }
+ internal MatrixTransform TransformFromDevice { get; }
/// <summary>
/// The destination device.
/// </summary>
- public static MatrixTransform TransformToDevice { get; }
+ internal MatrixTransform TransformToDevice { get; }
/// <summary>
/// The device DPI X value.
/// </summary>
- public static double DeviceDpiX { get; }
+ internal double DeviceDpiX { get; }
/// <summary>
/// The device DPI Y value.
/// </summary>
- public static double DeviceDpiY { get; }
+ internal double DeviceDpiY { get; }
/// <summary>
/// Logical value to Unit Scaling X.
/// </summary>
- public static double LogicalToDeviceUnitsScalingFactorX => TransformToDevice.Matrix.M11;
+ internal double LogicalToDeviceUnitsScalingFactorX => TransformToDevice.Matrix.M11;
/// <summary>
/// Logical value to Unit Scaling Y.
/// </summary>
- public static double LogicalToDeviceUnitsScalingFactorY => TransformToDevice.Matrix.M22;
+ internal double LogicalToDeviceUnitsScalingFactorY => TransformToDevice.Matrix.M22;
}
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Core/WindowService.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/WindowService.cs
index acdb3ee03..21b0c18d2 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Core/WindowService.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/WindowService.cs
@@ -1,21 +1,37 @@
using System.Windows;
+using System.Windows.Interop;
using DevToys.Blazor.Core.Services;
+using DevToys.Windows.Controls;
+using DevToys.Windows.Core.Helpers;
namespace DevToys.Windows.Core;
internal sealed class WindowService : IWindowService
{
- private Window? _window;
+ private MicaWindowWithOverlay? _window;
+ private bool _isCompactOverlayMode;
+ private WindowStateBackup? _nonCompactOverlayModeWindowState;
+ private WindowStateBackup? _compactOverlayModeWindowState;
public event EventHandler<EventArgs>? WindowActivated;
public event EventHandler<EventArgs>? WindowDeactivated;
public event EventHandler<EventArgs>? WindowLocationChanged;
public event EventHandler<EventArgs>? WindowSizeChanged;
public event EventHandler<EventArgs>? WindowClosing;
+ public event EventHandler<EventArgs>? IsCompactOverlayModeChanged;
- public bool IsOverlayMode { get; set; }
+ public bool IsCompactOverlayMode
+ {
+ get => _isCompactOverlayMode;
+ set
+ {
+ _isCompactOverlayMode = value;
+ UpdateCompactOverlayState(value);
+ IsCompactOverlayModeChanged?.Invoke(this, EventArgs.Empty);
+ }
+ }
- internal void SetWindow(Window window)
+ internal void SetWindow(MicaWindowWithOverlay window)
{
Guard.IsNull(_window);
Guard.IsNotNull(window);
@@ -28,6 +44,95 @@ internal sealed class WindowService : IWindowService
_window.Closing += Window_Closing;
}
+ private void UpdateCompactOverlayState(bool shouldEnterCompactOverlayMode)
+ {
+ Guard.IsNotNull(_window);
+
+ var dpiHelper = new DpiHelper(_window);
+ double DPI_SCALE = dpiHelper.LogicalToDeviceUnitsScalingFactorX;
+ var windowInteropHelper = new WindowInteropHelper(_window);
+ var screen = Screen.FromHandle(windowInteropHelper.Handle);
+
+ if (shouldEnterCompactOverlayMode)
+ {
+ // Save the state of the window before entering compact overlay mode.
+ _nonCompactOverlayModeWindowState
+ = new(
+ _window.Topmost,
+ _window.ActualHeight,
+ _window.ActualWidth,
+ _window.Top,
+ _window.Left,
+ _window.MaxHeight,
+ _window.MaxWidth,
+ _window.MinHeight,
+ _window.MinWidth,
+ _window.WindowState);
+
+ // Enter compact overlay mode
+ _window.ForbidMinimizeAndMaximize = true;
+
+ _window.WindowState = WindowState.Normal;
+ _window.Topmost = true;
+
+ if (_compactOverlayModeWindowState is null)
+ {
+ _window.MinWidth = 340;
+ _window.MinHeight = 400;
+ _window.MaxWidth = 640;
+ _window.MaxHeight = 800;
+ _window.Width = 600;
+ _window.Height = 400;
+ _window.Top = (screen.WorkingArea.Top / DPI_SCALE) + 32;
+ _window.Left = ((screen.WorkingArea.Left + screen.WorkingArea.Width) / DPI_SCALE) - _window.ActualWidth - 32;
+ }
+ else
+ {
+ _window.MinHeight = _compactOverlayModeWindowState.MinHeight;
+ _window.MinWidth = _compactOverlayModeWindowState.MinWidth;
+ _window.MaxHeight = _compactOverlayModeWindowState.MaxHeight;
+ _window.MaxWidth = _compactOverlayModeWindowState.MaxWidth;
+ _window.Height = _compactOverlayModeWindowState.Height;
+ _window.Width = _compactOverlayModeWindowState.Width;
+ _window.Top = _compactOverlayModeWindowState.Top;
+ _window.Left = _compactOverlayModeWindowState.Left;
+ }
+ }
+ else
+ {
+ // Save the state of the window while being in compact overlay mode.
+ _compactOverlayModeWindowState
+ = new(
+ _window.Topmost,
+ _window.ActualHeight,
+ _window.ActualWidth,
+ _window.Top,
+ _window.Left,
+ _window.MaxHeight,
+ _window.MaxWidth,
+ _window.MinHeight,
+ _window.MinWidth,
+ _window.WindowState);
+
+ // Restore the state of the window
+ _window.ForbidMinimizeAndMaximize = false;
+
+ Guard.IsNotNull(_nonCompactOverlayModeWindowState);
+
+ _window.MinHeight = _nonCompactOverlayModeWindowState.MinHeight;
+ _window.MinWidth = _nonCompactOverlayModeWindowState.MinWidth;
+ _window.MaxHeight = _nonCompactOverlayModeWindowState.MaxHeight;
+ _window.MaxWidth = _nonCompactOverlayModeWindowState.MaxWidth;
+ _window.Height = _nonCompactOverlayModeWindowState.Height;
+ _window.Width = _nonCompactOverlayModeWindowState.Width;
+ _window.Top = _nonCompactOverlayModeWindowState.Top;
+ _window.Left = _nonCompactOverlayModeWindowState.Left;
+
+ _window.WindowState = _nonCompactOverlayModeWindowState.State;
+ _window.Topmost = _nonCompactOverlayModeWindowState.Topmost;
+ }
+ }
+
private void Window_Activated(object? sender, EventArgs e)
{
WindowActivated?.Invoke(this, EventArgs.Empty);
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Core/WindowStateBackup.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/WindowStateBackup.cs
new file mode 100644
index 000000000..b71a56fba
--- /dev/null
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/WindowStateBackup.cs
@@ -0,0 +1,17 @@
+using System.Windows;
+
+namespace DevToys.Windows.Core;
+
+internal record WindowStateBackup(
+ bool Topmost,
+ double Height,
+ double Width,
+ double Top,
+ double Left,
+ double MaxHeight,
+ double MaxWidth,
+ double MinHeight,
+ double MinWidth,
+ WindowState State)
+{
+}
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml b/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml
index 59c703504..451c6aced 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml
@@ -8,12 +8,15 @@
xmlns:core="clr-namespace:DevToys.Core;assembly=DevToys.Core"
xmlns:controls="clr-namespace:DevToys.Windows.Controls"
xmlns:blazor="clr-namespace:Microsoft.AspNetCore.Components.WebView.Wpf;assembly=Microsoft.AspNetCore.Components.WebView.Wpf"
- d:DataContext="{d:DesignInstance Type=core:TitleBarMarginProvider}"
+ d:DataContext="{d:DesignInstance Type=core:TitleBarInfoProvider}"
mc:Ignorable="d"
Loaded="MainWindow_Loaded"
- Title="MainWindow"
+ MinWidth="600"
+ MinHeight="400"
+ Title="{Binding Title}"
TitleBarMarginLeft="{Binding TitleBarMarginLeft}"
- TitleBarMarginRight="{Binding TitleBarMarginRight}">
+ TitleBarMarginRight="{Binding TitleBarMarginRight}"
+ TitleBarWindowStateButtonsWidth="{Binding TitleBarWindowStateButtonsWidth, UpdateSourceTrigger=PropertyChanged, Mode=OneWayToSource}">
<Grid>
<blazor:BlazorWebView
x:Name="blazorWebView"
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs b/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs
index 26297367e..586c9ca0b 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
-using DevToys.Api;
+using System.Windows.Interop;
+using DevToys.Api;
using DevToys.Blazor.BuiltInTools;
using DevToys.Blazor.Core.Languages;
using DevToys.Blazor.Core.Services;
@@ -8,6 +9,7 @@ using DevToys.Core.Logging;
using DevToys.Core.Mef;
using DevToys.Windows.Controls;
using DevToys.Windows.Core;
+using DevToys.Windows.Core.Helpers;
using Microsoft.AspNetCore.Components.WebView;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
@@ -65,17 +67,21 @@ public partial class MainWindow : MicaWindowWithOverlay
_efficiencyModeService = _mefComposer.Provider.Import<EfficiencyModeService>();
_themeListener = _mefComposer.Provider.Import<IThemeListener>();
- DataContext = _mefComposer.Provider.Import<TitleBarMarginProvider>();
+ DataContext = _mefComposer.Provider.Import<TitleBarInfoProvider>();
blazorWebView.BlazorWebViewInitializing += BlazorWebView_BlazorWebViewInitializing;
blazorWebView.BlazorWebViewInitialized += BlazorWebView_BlazorWebViewInitialized;
// Set window default size and location.
// TODO: Save and restore user settings.
- Width = Math.Max(System.Windows.SystemParameters.WorkArea.Width - 400, 1200);
- Height = Math.Max(System.Windows.SystemParameters.WorkArea.Height - 200, 600);
- Left = (System.Windows.SystemParameters.WorkArea.Width - Width) / 2;
- Top = (System.Windows.SystemParameters.WorkArea.Height - Height) / 2;
+ var dpiHelper = new DpiHelper(this);
+ double DPI_SCALE = dpiHelper.LogicalToDeviceUnitsScalingFactorX;
+ var windowInteropHelper = new WindowInteropHelper(this);
+ var screen = Screen.FromHandle(windowInteropHelper.Handle);
+ Width = Math.Max(screen.WorkingArea.Width - 400, 1200) / DPI_SCALE;
+ Height = Math.Max(screen.WorkingArea.Height - 200, 600) / DPI_SCALE;
+ Left = ((screen.WorkingArea.Width / DPI_SCALE) - Width) / 2;
+ Top = ((screen.WorkingArea.Height / DPI_SCALE) - Height) / 2;
}
private void MainWindow_Loaded(object sender, System.Windows.RoutedEventArgs e)
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Native/NativeMethods.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Native/NativeMethods.cs
index e5f836130..fc688a79f 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Native/NativeMethods.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Native/NativeMethods.cs
@@ -38,6 +38,24 @@ internal static partial class NativeMethods
#pragma warning disable CA1416 // Validate platform compatibility
PInvoke.SetWindowLong(windowHandleChild, WINDOW_LONG_PTR_INDEX.GWL_STYLE, HwndSourceMessages.WS_CHILD);
PInvoke.SetParent(windowHandleChild, windowHandleParent);
+#pragma warning restore CA1416 // Validate platform compatibility
+ }
+
+ internal static void DisableMinimizeAndMaximizeCapabilities(HWND windowHandle)
+ {
+#pragma warning disable CA1416 // Validate platform compatibility
+ HMENU systemMenuHandle = PInvoke.GetSystemMenu(windowHandle, false);
+ PInvoke.EnableMenuItem(systemMenuHandle, (uint)PInvoke.SC_MAXIMIZE, MENU_ITEM_FLAGS.MF_BYCOMMAND | MENU_ITEM_FLAGS.MF_GRAYED);
+ PInvoke.EnableMenuItem(systemMenuHandle, (uint)PInvoke.SC_MINIMIZE, MENU_ITEM_FLAGS.MF_BYCOMMAND | MENU_ITEM_FLAGS.MF_GRAYED);
+#pragma warning restore CA1416 // Validate platform compatibility
+ }
+
+ internal static void EnableMinimizeAndMaximizeCapabilities(HWND windowHandle)
+ {
+#pragma warning disable CA1416 // Validate platform compatibility
+ HMENU systemMenuHandle = PInvoke.GetSystemMenu(windowHandle, false);
+ PInvoke.EnableMenuItem(systemMenuHandle, (uint)PInvoke.SC_MAXIMIZE, MENU_ITEM_FLAGS.MF_BYCOMMAND | MENU_ITEM_FLAGS.MF_ENABLED);
+ PInvoke.EnableMenuItem(systemMenuHandle, (uint)PInvoke.SC_MINIMIZE, MENU_ITEM_FLAGS.MF_BYCOMMAND | MENU_ITEM_FLAGS.MF_ENABLED);
#pragma warning restore CA1416 // Validate platform compatibility
}
}
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/NativeMethods.txt b/src/app/dev/platforms/desktop/DevToys.Windows/NativeMethods.txt
index a01773bd5..69d966bac 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/NativeMethods.txt
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/NativeMethods.txt
@@ -17,6 +17,8 @@ SetParent
GetDC
GetDeviceCaps
ReleaseDC
+GetSystemMenu
+EnableMenuItem
// Windows messages
WM_NCHITTEST
@@ -29,4 +31,10 @@ WM_MOVING
WM_SETCURSOR
WM_GETTEXT
WM_WINDOWPOSCHANGING
-WINDOW_STYLE
\ No newline at end of file
+
+// Windowing
+WINDOW_STYLE
+SC_SIZE
+SC_MAXIMIZE
+SC_MINIMIZE
+MENU_ITEM_FLAGS
\ No newline at end of file