Skip to content

A Swiss Army knife for developers.

Added efficiency mode + some clean-up

Etienne Baudoux52b300b8fb69
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 6f1f7edef..fb21448bb 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -22,6 +22,7 @@
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="$(DotNetVersion)" Condition="'$(UseMaui)' != 'true'" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="5.1.5" />
+ <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.18-beta"/>
<PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Nuke.Common" Version="7.0.2" />
diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUISplitGrid.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUISplitGrid.cs
index 34f37ebf6..f1a5443b9 100644
--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUISplitGrid.cs
+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUISplitGrid.cs
@@ -75,8 +75,8 @@ internal sealed class UISplitGrid : UIElement, IUISplitGrid
{
private UIOrientation _orientation = UIOrientation.Vertical;
private int _minimumCellLength = 50;
- private UIGridLength _leftOrTopCellLength = new UIGridLength(1, UIGridUnitType.Fraction);
- private UIGridLength _rightOrBottomCellLength = new UIGridLength(1, UIGridUnitType.Fraction);
+ private UIGridLength _leftOrTopCellLength = new(1, UIGridUnitType.Fraction);
+ private UIGridLength _rightOrBottomCellLength = new(1, UIGridUnitType.Fraction);
private IUIElement? _rightOrBottomCellContent;
private IUIElement? _leftOrTopCellContent;
diff --git a/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.cs b/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.cs
index 0114c1c1d..af428eede 100644
--- a/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.cs
+++ b/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.cs
@@ -6,7 +6,7 @@ public abstract class StyledComponentBase : ComponentBase
private readonly Lazy<ObservableHashSet<string>> _css;
- protected readonly HashSet<StyledComponentBase> _childrenComponents = new();
+ protected readonly HashSet<StyledComponentBase> ChildrenComponents = new();
/// <summary>
/// Gets a reference to the HTML element rendered by the component.
@@ -211,16 +211,13 @@ public abstract class StyledComponentBase : ComponentBase
{
base.OnInitialized();
- if (ParentComponent is not null)
- {
- ParentComponent.RegisterChildComponent(this);
- }
+ ParentComponent?.RegisterChildComponent(this);
}
protected void RegisterChildComponent(StyledComponentBase component)
{
Guard.IsNotNull(component);
- _childrenComponents.Add(component);
+ ChildrenComponents.Add(component);
}
/// <summary>
diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/Editor/Delegates.cs b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/Editor/Delegates.cs
index 4db51d741..3296f5a6f 100644
--- a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/Editor/Delegates.cs
+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/Editor/Delegates.cs
@@ -4,7 +4,6 @@
namespace DevToys.Blazor.Components.Monaco.Editor;
-
public delegate void CommandHandler(params object[] args);
/// <summary>
diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/Editor/EditorLayoutInfo.cs b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/Editor/EditorLayoutInfo.cs
index e2402a1f8..c09b90861 100644
--- a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/Editor/EditorLayoutInfo.cs
+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/Editor/EditorLayoutInfo.cs
@@ -89,5 +89,4 @@ public class EditorLayoutInfo
/// The position of the overview ruler.
/// </summary>
public OverviewRulerPosition? OverviewRuler { get; set; }
-
}
diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/Editor/EditorUpdateOptions.cs b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/Editor/EditorUpdateOptions.cs
index 539c2cf5e..288cf6ee8 100644
--- a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/Editor/EditorUpdateOptions.cs
+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/Editor/EditorUpdateOptions.cs
@@ -25,7 +25,7 @@ public class EditorUpdateOptions : EditorOptions, IGlobalEditorOptions
public int? MaxTokenizationLineLength { get; set; }
- public string? Theme { get; set; }
+ public string Theme { get; set; } = default!;
public bool? AutoDetectHighContrast { get; set; }
}
diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/MarkdownString.cs b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/MarkdownString.cs
index 11b02ecc5..3b6e2616d 100644
--- a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/MarkdownString.cs
+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/Monaco/MarkdownString.cs
@@ -8,7 +8,6 @@ public class MarkdownString
{
public string? Value { get; set; }
-
public bool? IsTrusted { get; set; }
public bool? SupportThemeIcons { get; set; }
diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.cs b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.cs
index cce9c314f..7ee022b30 100644
--- a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditor.razor.cs
@@ -4,7 +4,7 @@ namespace DevToys.Blazor.Components;
public partial class MonacoEditor : RicherMonacoEditorBase
{
- private readonly object _lock = new object();
+ private readonly object _lock = new();
private bool _isLoaded;
private bool _oldIsActuallyEnabled;
private bool _oldReadOnlyState;
@@ -139,9 +139,9 @@ public partial class MonacoEditor : RicherMonacoEditorBase
// if we succeed to load within 100ms.
// https://psychology.stackexchange.com/questions/1664/what-is-the-threshold-where-actions-are-perceived-as-instant
- const int delay = 100;
+ const int Delay = 100;
- await Task.Delay(delay);
+ await Task.Delay(Delay);
lock (_lock)
{
diff --git a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor.cs b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor.cs
index 8e8d4db58..d766d8712 100644
--- a/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/Text/MonacoEditor/MonacoEditorDiff.razor.cs
@@ -4,7 +4,7 @@ namespace DevToys.Blazor.Components;
public partial class MonacoEditorDiff : RicherMonacoEditorDiffBase
{
- private readonly object _lock = new object();
+ private readonly object _lock = new();
private bool _isLoaded;
private bool _oldIsActuallyEnabled;
private bool _oldReadOnlyState;
@@ -140,9 +140,9 @@ public partial class MonacoEditorDiff : RicherMonacoEditorDiffBase
// if we succeed to load within 100ms.
// https://psychology.stackexchange.com/questions/1664/what-is-the-threshold-where-actions-are-perceived-as-instant
- const int delay = 100;
+ const int Delay = 100;
- await Task.Delay(delay);
+ await Task.Delay(Delay);
lock (_lock)
{
diff --git a/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.cs b/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.cs
index 35cd4f222..cf021c470 100644
--- a/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/Text/TextBox/TextBox.razor.cs
@@ -235,11 +235,11 @@ public partial class TextBox : MefComponentBase, IFocusable
private async Task OnPasteAsync(DropDownListItem _)
{
object? clipboardData = await Clipboard.GetClipboardDataAsync();
- if (clipboardData is string)
+ if (clipboardData is string clipboardDataString)
{
TextSpan selection = await GetSelectionAsync();
Text ??= string.Empty;
- string newText = Text.Substring(0, selection.StartPosition) + (string)clipboardData + Text.Substring(selection.EndPosition);
+ string newText = string.Concat(Text.AsSpan(0, selection.StartPosition), clipboardDataString, Text.AsSpan(selection.EndPosition));
await SetTextAsync(newText);
}
}
diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIDiffTextInputPresenter.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UIDiffTextInputPresenter.razor.cs
index 18b46906e..e198337b8 100644
--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIDiffTextInputPresenter.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIDiffTextInputPresenter.razor.cs
@@ -45,27 +45,21 @@ public partial class UIDiffTextInputPresenter : JSStyledComponentBase, IDisposab
{
// Get or create the original model
TextModel original_model = await MonacoEditorHelper.GetModelAsync(JSRuntime, uri: _originalModelName);
- if (original_model == null)
- {
- original_model
- = await MonacoEditorHelper.CreateModelAsync(
+ original_model
+ ??= await MonacoEditorHelper.CreateModelAsync(
JSRuntime,
UIDiffTextInput.Text,
language: null,
uri: _originalModelName);
- }
// Get or create the modified model
TextModel modified_model = await MonacoEditorHelper.GetModelAsync(JSRuntime, uri: _modifiedModelName);
- if (modified_model == null)
- {
- modified_model
- = await MonacoEditorHelper.CreateModelAsync(
+ modified_model
+ ??= await MonacoEditorHelper.CreateModelAsync(
JSRuntime,
UIDiffTextInput.ModifiedText,
language: null,
uri: _modifiedModelName);
- }
// Set the editor model
await _monacoEditor.SetModelAsync(new DiffEditorModel
diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.cs
index e10cd3e34..5ce18960d 100644
--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UITextInputWrapper.razor.cs
@@ -13,7 +13,7 @@ public partial class UITextInputWrapper : MefComponentBase
private const int MinimumWidthBeforeShrinkingToolBar = 500;
private const int MinimumWidthBeforeHidingNonEssentialToolBar = 300;
- private static readonly string[] FileTypes = new[]
+ private static readonly string[] fileTypes = new[]
{
"*.*",
"*.txt",
@@ -185,7 +185,7 @@ public partial class UITextInputWrapper : MefComponentBase
PickedFile? pickedFile = null;
try
{
- pickedFile = await FileStorage.PickOpenFileAsync(FileTypes);
+ pickedFile = await FileStorage.PickOpenFileAsync(fileTypes);
if (pickedFile is not null)
{
await LoadFileAsync(pickedFile.Stream);
@@ -322,8 +322,8 @@ public partial class UITextInputWrapper : MefComponentBase
private async Task FocusOnTextEditorAsync()
{
- Guard.IsEqualTo(_childrenComponents.Count, 1);
- var focusableChild = _childrenComponents.First() as IFocusable;
+ Guard.IsEqualTo(ChildrenComponents.Count, 1);
+ var focusableChild = ChildrenComponents.First() as IFocusable;
if (focusableChild is not null)
{
await focusableChild.FocusAsync();
diff --git a/src/app/dev/DevToys.Blazor/Core/Helpers/CssBuilder.cs b/src/app/dev/DevToys.Blazor/Core/Helpers/CssBuilder.cs
index 16826dcb7..f22bc1b1e 100644
--- a/src/app/dev/DevToys.Blazor/Core/Helpers/CssBuilder.cs
+++ b/src/app/dev/DevToys.Blazor/Core/Helpers/CssBuilder.cs
@@ -120,7 +120,7 @@ public struct CssBuilder
/// Finalize the completed CSS Classes as a string.
/// </summary>
/// <returns>string</returns>
- public string Build()
+ public readonly string Build()
{
// String buffer finalization code
return _stringBuffer != null ? _stringBuffer.Trim() : string.Empty;
diff --git a/src/app/dev/DevToys.Blazor/Core/Helpers/StyleBuilder.cs b/src/app/dev/DevToys.Blazor/Core/Helpers/StyleBuilder.cs
index b54bb042c..7472f0bfe 100644
--- a/src/app/dev/DevToys.Blazor/Core/Helpers/StyleBuilder.cs
+++ b/src/app/dev/DevToys.Blazor/Core/Helpers/StyleBuilder.cs
@@ -193,7 +193,7 @@ public struct StyleBuilder
/// Finalize the completed Style as a string.
/// </summary>
/// <returns>string</returns>
- public string Build()
+ public readonly string Build()
{
// String buffer finalization code
return _stringBuffer != null ? _stringBuffer.Trim() : string.Empty;
diff --git a/src/app/dev/DevToys.Blazor/Core/Services/FontService.cs b/src/app/dev/DevToys.Blazor/Core/Services/FontService.cs
index 5ff447215..1bd4a8704 100644
--- a/src/app/dev/DevToys.Blazor/Core/Services/FontService.cs
+++ b/src/app/dev/DevToys.Blazor/Core/Services/FontService.cs
@@ -126,7 +126,7 @@ public sealed partial class FontService
return string.Empty;
}
- private async Task<string> ConvertFontToBase64Async(FontDefinition fontDefinition)
+ private static async Task<string> ConvertFontToBase64Async(FontDefinition fontDefinition)
{
byte[] buffer = new byte[fontDefinition.FontReader.Length];
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 d93a5611f..b3b8cc74e 100644
--- a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor.cs
@@ -53,6 +53,7 @@ public partial class ToolPage : MefComponentBase, IDisposable
private void OnToggleFavorite()
{
+ Guard.IsNotNull(IndexPage);
ViewModel.ToggleSelectedMenuItemFavoriteCommand.Execute(null);
IndexPage.StateHasChanged();
}
diff --git a/src/app/dev/DevToys.Business/ViewModels/ToolPageViewModel.cs b/src/app/dev/DevToys.Business/ViewModels/ToolPageViewModel.cs
index 0395725a5..fb7ee7eda 100644
--- a/src/app/dev/DevToys.Business/ViewModels/ToolPageViewModel.cs
+++ b/src/app/dev/DevToys.Business/ViewModels/ToolPageViewModel.cs
@@ -68,6 +68,7 @@ internal sealed partial class ToolPageViewModel : ObservableRecipient
internal string GetFavoriteButtonText(bool isSelectedMenuItemAFavoriteTool)
{
+ Guard.IsNotNull(_guiToolViewItem);
if (isSelectedMenuItemAFavoriteTool)
{
return ToolPage.RemoveFromFavorites;
diff --git a/src/app/dev/DevToys.Core/Tools/SmartDetectionService.cs b/src/app/dev/DevToys.Core/Tools/SmartDetectionService.cs
index e964445f3..de7b47afb 100644
--- a/src/app/dev/DevToys.Core/Tools/SmartDetectionService.cs
+++ b/src/app/dev/DevToys.Core/Tools/SmartDetectionService.cs
@@ -172,7 +172,7 @@ public sealed partial class SmartDetectionService
{
return await detector.TryDetectDataAsync(rawData, resultFromBaseDetector, cancellationToken) ?? DataDetectionResult.Unsuccessful;
}
- catch (Exception ex) when (!(ex is OperationCanceledException))
+ catch (Exception ex) when (ex is not OperationCanceledException)
{
LogDetectAsyncError(ex);
}
@@ -211,10 +211,7 @@ public sealed partial class SmartDetectionService
{
// If the current detector has a base data type name and its parent node exists in the dictionary,
// add it as a child to its parent node
- if (parentNode.ChildrenDetectors is null)
- {
- parentNode.ChildrenDetectors = new();
- }
+ parentNode.ChildrenDetectors ??= new();
parentNode.ChildrenDetectors.Add(node.Value);
}
diff --git a/src/app/dev/platforms/desktop/DevToys.CLI/Core/Settings/SettingsStorage.cs b/src/app/dev/platforms/desktop/DevToys.CLI/Core/Settings/SettingsStorage.cs
index 2b30d5788..c03d711a6 100644
--- a/src/app/dev/platforms/desktop/DevToys.CLI/Core/Settings/SettingsStorage.cs
+++ b/src/app/dev/platforms/desktop/DevToys.CLI/Core/Settings/SettingsStorage.cs
@@ -29,9 +29,9 @@ internal sealed class SettingsStorage : ISettingsStorage
public bool TryReadSetting(string settingName, out object? value)
{
- if (_settings.Value.ContainsKey(settingName))
+ if (_settings.Value.TryGetValue(settingName, out string? valueString))
{
- value = _settings.Value[settingName];
+ value = valueString;
return true;
}
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/HwndHostEx.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/HwndHostEx.cs
index 57553281c..b719e5f1c 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/HwndHostEx.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/HwndHostEx.cs
@@ -1,14 +1,15 @@
using System.Runtime.InteropServices;
using System.Windows.Interop;
using DevToys.Windows.Native;
+using Windows.Win32.Foundation;
namespace DevToys.Windows.Controls;
internal sealed class HwndHostEx : HwndHost
{
- private readonly nint _childHandle;
+ private readonly HWND _childHandle;
- public HwndHostEx(nint handle)
+ public HwndHostEx(HWND handle)
{
_childHandle = handle;
}
@@ -19,7 +20,7 @@ internal sealed class HwndHostEx : HwndHost
if (_childHandle != IntPtr.Zero)
{
- NativeMethods.SetWindowAsChildOf(_childHandle, windowHandleParent.Handle);
+ NativeMethods.SetWindowAsChildOf(_childHandle, new HWND(windowHandleParent.Handle));
handleRef = new HandleRef(this, _childHandle);
}
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 e0563198b..bfe453fb9 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
@@ -7,7 +7,12 @@ using System.Windows.Interop;
using System.Windows.Media;
using System.Windows.Shell;
using DevToys.Api;
+using DevToys.Windows.Core;
using DevToys.Windows.Native;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.Graphics.Dwm;
+using Windows.Win32.UI.Controls;
using Application = System.Windows.Application;
using Button = System.Windows.Controls.Button;
using Color = System.Windows.Media.Color;
@@ -19,19 +24,9 @@ namespace DevToys.Windows.Controls;
public abstract partial class MicaWindowWithOverlay : Window
{
- private readonly Lazy<Version> _windowsVersion
- = new(() =>
- {
- if (NativeMethods.RtlGetVersion(out OSVERSIONINFOEX osv) != 0)
- {
- throw new PlatformNotSupportedException("This app can only run on Windows.");
- }
-
- return new Version(osv.MajorVersion, osv.MinorVersion, osv.BuildNumber, osv.Revision);
- });
-
private readonly ResourceDictionary _resourceDictionary;
protected IThemeListener? _themeListener;
+ protected EfficiencyModeService? _efficiencyModeService;
private Button? _restoreButton;
private Button? _maximizeButton;
@@ -47,6 +42,7 @@ public abstract partial class MicaWindowWithOverlay : Window
ApplyResizeBorderThickness();
Closed += MicaWindowWithOverlay_Closed;
+ Loaded += MicaWindowWithOverlay_Loaded;
}
internal static readonly DependencyProperty TitleBarMarginLeftProperty
@@ -126,8 +122,17 @@ public abstract partial class MicaWindowWithOverlay : Window
base.OnPropertyChanged(e);
}
+ private void MicaWindowWithOverlay_Loaded(object sender, RoutedEventArgs e)
+ {
+ Guard.IsNotNull(_efficiencyModeService);
+ _efficiencyModeService.RegisterWindow(this);
+ }
+
private void MicaWindowWithOverlay_Closed(object? sender, EventArgs e)
{
+ Guard.IsNotNull(_efficiencyModeService);
+ _efficiencyModeService.UnregisterWindow(this);
+
var overlayControl = (OverlayControl)Template.FindName("TitleBar", this);
overlayControl.Dispose();
}
@@ -199,16 +204,16 @@ public abstract partial class MicaWindowWithOverlay : Window
bool handled = false;
// Handle Windows 11's Snap Layout.
- if (msg == HwndSourceMessages.WM_NCHITTEST)
+ if (msg == PInvoke.WM_NCHITTEST)
{
- bool isWindow11_OrGreater = _windowsVersion.Value >= new Version(10, 0, 22000);
+ bool isWindow11_OrGreater = Environment.OSVersion.Version >= new Version(10, 0, 22000);
if (isWindow11_OrGreater & SnapLayoutHelper.IsSnapLayoutEnabled())
{
nint result = ShowSnapLayout(lParam, ref handled);
return (result, handled);
}
}
- else if (msg == HwndSourceMessages.WM_NCLBUTTONDOWN)
+ else if (msg == PInvoke.WM_NCLBUTTONDOWN)
{
HandleClickOnMaximizeAndRestoreButton(lParam, ref handled);
}
@@ -221,12 +226,12 @@ public abstract partial class MicaWindowWithOverlay : Window
// Apply the dark / light theme.
UpdateTheme();
- bool isWindow10_17763_OrHigher = _windowsVersion.Value >= new Version(10, 0, 17763);
+ bool isWindow10_17763_OrHigher = Environment.OSVersion.Version >= new Version(10, 0, 17763);
// If Windows 10 17763 or higher
if (isWindow10_17763_OrHigher)
{
- nint windowHandle = new WindowInteropHelper(this).EnsureHandle();
+ var windowHandle = new HWND(new WindowInteropHelper(this).EnsureHandle());
// Extends the window frame into the client area.
ExtendWindowFrameIntoClientArea(windowHandle);
@@ -259,38 +264,41 @@ public abstract partial class MicaWindowWithOverlay : Window
cyBottomHeight = -1
};
- NativeMethods.ExtendFrame(mainWindowSrc.Handle, margins);
+ NativeMethods.ExtendFrame(new HWND(mainWindowSrc.Handle), margins);
}
- private void ApplyBackdrop(nint windowHandle)
+ private void ApplyBackdrop(HWND windowHandle)
{
Guard.IsNotNull(_themeListener);
- bool isWindow11_22523_OrGreater = _windowsVersion.Value >= new Version(10, 0, 22523);
- bool isWindow11_OrGreater = _windowsVersion.Value >= new Version(10, 0, 22000);
+ bool isWindow11_22523_OrGreater = Environment.OSVersion.Version >= new Version(10, 0, 22523);
+ bool isWindow11_OrGreater = Environment.OSVersion.Version >= new Version(10, 0, 22000);
if (_themeListener.ActualAppTheme == ApplicationTheme.Dark)
{
- NativeMethods.SetWindowAttribute(windowHandle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, DwmValues.True);
+ int parameter = DwmValues.True;
+ NativeMethods.SetWindowAttribute(windowHandle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, ref parameter);
}
else
{
- NativeMethods.SetWindowAttribute(windowHandle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, DwmValues.False);
+ int parameter = DwmValues.False;
+ NativeMethods.SetWindowAttribute(windowHandle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, ref parameter);
}
if (isWindow11_22523_OrGreater)
{
- const int Mica = 2;
- NativeMethods.SetWindowAttribute(windowHandle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, Mica);
+ int Mica = 2;
+ NativeMethods.SetWindowAttribute(windowHandle, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE, ref Mica);
}
else if (isWindow11_OrGreater)
{
- NativeMethods.SetWindowAttribute(windowHandle, DWMWINDOWATTRIBUTE.DWMWA_MICA_EFFECT, DwmValues.True);
+ int parameter = DwmValues.True;
+ NativeMethods.SetWindowAttribute(windowHandle, (DWMWINDOWATTRIBUTE)DWMWINDOWATTRIBUTE_EXTENDED.DWMWA_MICA_EFFECT, ref parameter);
}
}
private void ApplyResizeBorderThickness()
{
- bool isWindow11_OrGreater = _windowsVersion.Value >= new Version(10, 0, 22000);
+ bool isWindow11_OrGreater = Environment.OSVersion.Version >= new Version(10, 0, 22000);
int cornerRadius = isWindow11_OrGreater ? 8 : 0;
MarginMaximized = WindowState == WindowState.Maximized ? new Thickness(6) : new Thickness(0);
@@ -347,7 +355,7 @@ public abstract partial class MicaWindowWithOverlay : Window
dictionaries.Add(resourceDictionary);
UpdateLayout();
- bool isWindow10_17763_OrLower = _windowsVersion.Value < new Version(10, 0, 17763);
+ bool isWindow10_17763_OrLower = Environment.OSVersion.Version < new Version(10, 0, 17763);
// If Windows 10 17763 or lower
if (isWindow10_17763_OrLower)
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/OverlayControl.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/OverlayControl.cs
index caf329d30..fa8ddcbcb 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/OverlayControl.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/OverlayControl.cs
@@ -1,5 +1,6 @@
using System.Windows.Controls;
using System.Windows.Interop;
+using Windows.Win32.Foundation;
namespace DevToys.Windows.Controls;
@@ -26,7 +27,7 @@ internal sealed class OverlayControl : ContentControl, IDisposable
};
_overlayWindow.Show();
- IntPtr windowHandle = new WindowInteropHelper(_overlayWindow).Handle;
+ var windowHandle = new HWND(new WindowInteropHelper(_overlayWindow).Handle);
_host = new HwndHostEx(windowHandle);
Content = _host;
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Core/EfficiencyModeService.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/EfficiencyModeService.cs
new file mode 100644
index 000000000..d9fd326b6
--- /dev/null
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/EfficiencyModeService.cs
@@ -0,0 +1,174 @@
+using System.Runtime.Versioning;
+using System.Windows;
+using Windows.Win32;
+using Windows.Win32.System.Threading;
+
+namespace DevToys.Windows.Core;
+
+[Export]
+public sealed class EfficiencyModeService
+{
+ private readonly HashSet<Window> _activeWindows = new();
+
+ internal event EventHandler? EfficiencyModeEnabled;
+
+ internal event EventHandler? EfficiencyModeDisabled;
+
+ internal void RegisterWindow(Window window)
+ {
+ Guard.IsNotNull(window);
+
+ if (Environment.OSVersion.Version >= new Version(10, 0, 16299))
+ {
+#pragma warning disable CA1416 // Validate platform compatibility
+ window.LostFocus += Window_LostFocus;
+
+ if (window.IsFocused)
+ {
+ _activeWindows.Add(window);
+ }
+
+ window.GotFocus += Window_GotFocus;
+ UpdateEfficiencyMode();
+#pragma warning restore CA1416 // Validate platform compatibility
+ }
+ }
+
+ internal void UnregisterWindow(Window window)
+ {
+ Guard.IsNotNull(window);
+
+ if (Environment.OSVersion.Version >= new Version(10, 0, 16299))
+ {
+#pragma warning disable CA1416 // Validate platform compatibility
+ window.LostFocus -= Window_LostFocus;
+ window.GotFocus -= Window_GotFocus;
+ _activeWindows.Remove(window);
+ UpdateEfficiencyMode();
+#pragma warning restore CA1416 // Validate platform compatibility
+ }
+ }
+
+ [SupportedOSPlatform("windows10.0.16299.0")]
+ private void Window_LostFocus(object sender, RoutedEventArgs e)
+ {
+ _activeWindows.Remove((Window)sender);
+ UpdateEfficiencyMode();
+ }
+
+ [SupportedOSPlatform("windows10.0.16299.0")]
+ private void Window_GotFocus(object sender, RoutedEventArgs e)
+ {
+ _activeWindows.Add((Window)sender);
+ UpdateEfficiencyMode();
+ }
+
+ [SupportedOSPlatform("windows10.0.16299.0")]
+ private void UpdateEfficiencyMode()
+ {
+ bool enableEfficiencyMode = _activeWindows.Count == 0;
+
+ if (Environment.OSVersion.Platform == PlatformID.Win32NT &&
+ Environment.OSVersion.Version >= new Version(10, 0, 16299))
+ {
+ SetEfficiencyMode(enableEfficiencyMode);
+ }
+
+ if (enableEfficiencyMode)
+ {
+ EfficiencyModeEnabled?.Invoke(this, EventArgs.Empty);
+ }
+ else
+ {
+ EfficiencyModeDisabled?.Invoke(this, EventArgs.Empty);
+ }
+ }
+
+ /// <summary>
+ /// Enables/disables efficient mode for process <br/>
+ /// Based on: <see href="https://devblogs.microsoft.com/performance-diagnostics/reduce-process-interference-with-task-manager-efficiency-mode/"/>
+ /// </summary>
+ /// <param name="value"></param>
+ [SupportedOSPlatform("windows10.0.16299.0")]
+ private static void SetEfficiencyMode(bool value)
+ {
+ bool isWindow11_OrGreater = Environment.OSVersion.Version >= new Version(10, 0, 22000);
+
+#pragma warning disable CA1416 // Validate platform compatibility
+ QualityOfServiceLevel ecoLevel = isWindow11_OrGreater ? QualityOfServiceLevel.Eco : QualityOfServiceLevel.Low;
+#pragma warning restore CA1416 // Validate platform compatibility
+
+ SetProcessQualityOfServiceLevel(value ? ecoLevel : QualityOfServiceLevel.Default);
+ SetProcessPriorityClass(value ? ProcessPriorityClass.Idle : ProcessPriorityClass.Normal);
+ }
+
+ /// <summary>
+ /// Based on <see href="https://docs.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-setprocessinformation"/>
+ /// </summary>
+ [SupportedOSPlatform("windows10.0.16299.0")]
+ public static unsafe void SetProcessQualityOfServiceLevel(QualityOfServiceLevel level)
+ {
+ bool isWindow11_OrGreater = Environment.OSVersion.Version >= new Version(10, 0, 22000);
+
+ var powerThrottling = new PROCESS_POWER_THROTTLING_STATE
+ {
+ Version = PInvoke.PROCESS_POWER_THROTTLING_CURRENT_VERSION
+ };
+
+ switch (level)
+ {
+ // Let system manage all power throttling. ControlMask is set to 0 as we don’t want
+ // to control any mechanisms.
+ case QualityOfServiceLevel.Default:
+ powerThrottling.ControlMask = 0;
+ powerThrottling.StateMask = 0;
+ break;
+
+#pragma warning disable CA1416 // Validate platform compatibility
+ // Turn EXECUTION_SPEED throttling on.
+ // ControlMask selects the mechanism and StateMask declares which mechanism should be on or off.
+ case QualityOfServiceLevel.Eco when isWindow11_OrGreater:
+#pragma warning restore CA1416 // Validate platform compatibility
+ case QualityOfServiceLevel.Low:
+ powerThrottling.ControlMask = PInvoke.PROCESS_POWER_THROTTLING_EXECUTION_SPEED;
+ powerThrottling.StateMask = PInvoke.PROCESS_POWER_THROTTLING_EXECUTION_SPEED;
+ break;
+
+ // Turn EXECUTION_SPEED throttling off.
+ // ControlMask selects the mechanism and StateMask is set to zero as mechanisms should be turned off.
+ case QualityOfServiceLevel.High:
+ powerThrottling.ControlMask = PInvoke.PROCESS_POWER_THROTTLING_EXECUTION_SPEED;
+ powerThrottling.StateMask = 0;
+ break;
+
+ default:
+ throw new NotImplementedException();
+ }
+
+ _ = PInvoke.SetProcessInformation(
+ hProcess: PInvoke.GetCurrentProcess(),
+ ProcessInformationClass: PROCESS_INFORMATION_CLASS.ProcessPowerThrottling,
+ ProcessInformation: &powerThrottling,
+ ProcessInformationSize: (uint)sizeof(PROCESS_POWER_THROTTLING_STATE));
+ }
+
+ /// <summary>
+ /// Based on <see href="https://docs.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-setpriorityclass"/>
+ /// </summary>
+ [SupportedOSPlatform("windows5.1.2600")]
+ public static unsafe void SetProcessPriorityClass(ProcessPriorityClass priorityClass)
+ {
+ PROCESS_CREATION_FLAGS flags = priorityClass switch
+ {
+ ProcessPriorityClass.Idle => PROCESS_CREATION_FLAGS.IDLE_PRIORITY_CLASS,
+ ProcessPriorityClass.BelowNormal => PROCESS_CREATION_FLAGS.BELOW_NORMAL_PRIORITY_CLASS,
+ ProcessPriorityClass.Normal => PROCESS_CREATION_FLAGS.NORMAL_PRIORITY_CLASS,
+ ProcessPriorityClass.AboveNormal => PROCESS_CREATION_FLAGS.ABOVE_NORMAL_PRIORITY_CLASS,
+ ProcessPriorityClass.High => PROCESS_CREATION_FLAGS.HIGH_PRIORITY_CLASS,
+ ProcessPriorityClass.RealTime => PROCESS_CREATION_FLAGS.REALTIME_PRIORITY_CLASS,
+ _ => throw new NotImplementedException(),
+ };
+
+ _ = PInvoke.SetPriorityClass(hProcess: PInvoke.GetCurrentProcess(), dwPriorityClass: flags);
+ }
+}
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Core/QualityOfServiceLevel.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/QualityOfServiceLevel.cs
new file mode 100644
index 000000000..3894299eb
--- /dev/null
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/QualityOfServiceLevel.cs
@@ -0,0 +1,76 @@
+using System.Runtime.Versioning;
+
+namespace DevToys.Windows.Core;
+
+/// <summary>
+/// The system maintains multiple QoS levels, each with differentiated performance and power efficiency. <br/>
+/// Windows provides standard default settings for scheduling and processor power management for each QoS level. <br/>
+/// The precise tuning of each QoS level for processor power management and heterogeneous scheduling can be modified through Windows Provisioning. <br/>
+/// For more information on performance tuning and provisioning, see: <br/>
+/// <see href="https://docs.microsoft.com/en-us/windows/win32/procthread/quality-of-service#quality-of-service-levels"/>
+/// </summary>
+[SupportedOSPlatform("windows8.0")]
+public enum QualityOfServiceLevel
+{
+ /// <summary>
+ /// Default system managed behavior. Let system manage all power throttling. <br/>
+ /// </summary>
+ Default,
+
+ /// <summary>
+ /// Description: Windowed applications that are in the foreground and in focus, or audible,
+ /// and explicitly tag processes with SetProcessInformation or threads with SetThreadInformation. <br/>
+ /// Performance and power: Standard high performance. <br/>
+ /// Release: 1709 <br/>
+ /// </summary>
+ [SupportedOSPlatform("windows10.0.16299.0")]
+ High,
+
+ /// <summary>
+ /// Description: Windowed applications that may be visible to the end user but are not in focus. <br/>
+ /// Performance and power: Varies by platform, between High and Low. <br/>
+ /// Release: 1709 <br/>
+ /// </summary>
+ [SupportedOSPlatform("windows10.0.16299.0")]
+ Medium,
+
+ /// <summary>
+ /// Description: Windowed applications that are not visible or audible to the end user. <br/>
+ /// Performance and power: On battery, selects most efficient CPU frequency and schedules to efficient core. <br/>
+ /// Release: 1709 <br/>
+ /// </summary>
+ [SupportedOSPlatform("windows10.0.16299.0")]
+ Low,
+
+ /// <summary>
+ /// Description: Background services. <br/>
+ /// Performance and power: On battery, selects most efficient CPU frequency and schedules to efficient cores. <br/>
+ /// Release: Windows 11 22H2 <br/>
+ /// </summary>
+ [SupportedOSPlatform("windows11.0.22621.0")]
+ Utility,
+
+ /// <summary>
+ /// Description: Applications that explicitly tag processes with SetProcessInformation or threads with SetThreadInformation. <br/>
+ /// Performance and power: Always selects most efficient CPU frequency and schedules to efficient cores. <br/>
+ /// Release: Windows 11 <br/>
+ /// </summary>
+ [SupportedOSPlatform("windows11.0")]
+ Eco,
+
+ /// <summary>
+ /// Description: Threads explicitly tagged by the Multimedia Class Scheduler Service to denote multimedia batch buffering. <br/>
+ /// Performance and power: CPU frequency reduced for efficient batch processing. <br/>
+ /// Release: 2004 <br/>
+ /// </summary>
+ [SupportedOSPlatform("windows10.0.19041.0")]
+ Media,
+
+ /// <summary>
+ /// Description: Threads explicitly tagged by Multimedia Class Scheduler Service to denote that audio threads require performance to meet deadlines. <br/>
+ /// Performance and power: High performance to meet media deadlines. <br/>
+ /// Release: 2004 <br/>
+ /// </summary>
+ [SupportedOSPlatform("windows10.0.19041.0")]
+ Deadline,
+}
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Core/SettingsStorage.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/SettingsStorage.cs
index 7b3f32014..8586733c1 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Core/SettingsStorage.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/SettingsStorage.cs
@@ -30,9 +30,9 @@ internal sealed class SettingsStorage : ISettingsStorage
public bool TryReadSetting(string settingName, out object? value)
{
- if (_settings.Value.ContainsKey(settingName))
+ if (_settings.Value.TryGetValue(settingName, out string? valueString))
{
- value = _settings.Value[settingName];
+ value = valueString;
return true;
}
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/DevToys.Windows.csproj b/src/app/dev/platforms/desktop/DevToys.Windows/DevToys.Windows.csproj
index 50beafd4d..1c31ad40e 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/DevToys.Windows.csproj
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/DevToys.Windows.csproj
@@ -8,6 +8,7 @@
<UseWindowsForms>true</UseWindowsForms>
<ApplicationManifest>app.manifest</ApplicationManifest>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
</PropertyGroup>
<ItemGroup>
@@ -18,6 +19,9 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
+ <PackageReference Include="Microsoft.Windows.CsWin32">
+ <PrivateAssets>all</PrivateAssets>
+ </PackageReference>
</ItemGroup>
<ItemGroup>
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 57f8e6cbf..26297367e 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs
@@ -63,6 +63,7 @@ public partial class MainWindow : MicaWindowWithOverlay
Resources.Add("services", _serviceProvider);
InitializeComponent();
+ _efficiencyModeService = _mefComposer.Provider.Import<EfficiencyModeService>();
_themeListener = _mefComposer.Provider.Import<IThemeListener>();
DataContext = _mefComposer.Provider.Import<TitleBarMarginProvider>();
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Native/DWMWINDOWATTRIBUTE.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Native/DWMWINDOWATTRIBUTE.cs
deleted file mode 100644
index 124c83a06..000000000
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Native/DWMWINDOWATTRIBUTE.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace DevToys.Windows.Native;
-
-[Flags]
-public enum DWMWINDOWATTRIBUTE
-{
- DWMWA_USE_IMMERSIVE_DARK_MODE = 20,
- DWMWA_SYSTEMBACKDROP_TYPE = 38,
- DWMWA_MICA_EFFECT = 1029,
- DWMWA_WINDOW_CORNER_PREFERENCE = 33
-}
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Native/DWMWINDOWATTRIBUTE_EXTENDED.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Native/DWMWINDOWATTRIBUTE_EXTENDED.cs
new file mode 100644
index 000000000..81edf2634
--- /dev/null
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Native/DWMWINDOWATTRIBUTE_EXTENDED.cs
@@ -0,0 +1,7 @@
+namespace DevToys.Windows.Native;
+
+[Flags]
+public enum DWMWINDOWATTRIBUTE_EXTENDED
+{
+ DWMWA_MICA_EFFECT = 1029
+}
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Native/DpiHelper.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Native/DpiHelper.cs
index fe4845b1d..b0bc15c9d 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Native/DpiHelper.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Native/DpiHelper.cs
@@ -1,4 +1,7 @@
using System.Windows.Media;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.Graphics.Gdi;
namespace DevToys.Windows.Native;
@@ -11,20 +14,20 @@ public static class DpiHelper
static DpiHelper()
{
- nint dC = NativeMethods.GetDC(nint.Zero);
+#pragma warning disable CA1416 // Validate platform compatibility
+ HDC dC = PInvoke.GetDC(HWND.Null);
if (dC != nint.Zero)
{
- const int logicPixelsX = 88;
- const int logicPixelsY = 90;
- _ = DeviceDpiX = NativeMethods.GetDeviceCaps(dC, logicPixelsX);
- _ = DeviceDpiY = NativeMethods.GetDeviceCaps(dC, logicPixelsY);
- _ = NativeMethods.ReleaseDC(nint.Zero, dC);
+ _ = DeviceDpiX = PInvoke.GetDeviceCaps(dC, GET_DEVICE_CAPS_INDEX.LOGPIXELSX);
+ _ = DeviceDpiY = PInvoke.GetDeviceCaps(dC, GET_DEVICE_CAPS_INDEX.LOGPIXELSY);
+ _ = PInvoke.ReleaseDC(HWND.Null, dC);
}
else
{
DeviceDpiX = LogicalDpi;
DeviceDpiY = LogicalDpi;
}
+#pragma warning restore CA1416 // Validate platform compatibility
Matrix identity = Matrix.Identity;
Matrix identity2 = Matrix.Identity;
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Native/HwndButtons.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Native/HwndButtons.cs
index 7996fe749..10ee97a90 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Native/HwndButtons.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Native/HwndButtons.cs
@@ -2,9 +2,5 @@
internal static class HwndButtons
{
- public const int
- GWL_STYLE = -16,
- WS_MAXIMIZEBOX = 0x10000,
- WS_MINIMIZEBOX = 0x20000,
- WS_SYSMENU = 0x80000;
+ public const int WS_SYSMENU = 0x80000;
}
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Native/HwndSourceMessages.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Native/HwndSourceMessages.cs
index 7f113011e..22e12ce9d 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Native/HwndSourceMessages.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Native/HwndSourceMessages.cs
@@ -2,18 +2,5 @@
internal static class HwndSourceMessages
{
- internal const int
- WM_NCHITTEST = 0x0084,
- WM_NCLBUTTONDOWN = 0x00A1,
- WM_MAXIMIZE = 0x0024,
- WM_NCPAINT = 0x0085,
- WM_ERASEBKGND = 0x0014,
- WM_PAINT = 0x000F,
- WM_GETMINMAXINFO = 0x0024,
- WM_MOVING = 0x0216,
- WM_SETCURSOR = 0x20,
- WM_GETTEXT = 0xD,
- WM_WINDOWPOSCHANGING = 0x46,
- WM_SIZING = 0x0214,
- WS_CHILD = 0x40000000;
+ internal const int WS_CHILD = 0x40000000;
}
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Native/MARGINS.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Native/MARGINS.cs
deleted file mode 100644
index 3cc439fcb..000000000
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Native/MARGINS.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace DevToys.Windows.Native;
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct MARGINS
-{
- public int cxLeftWidth; // width of left border that retains its size
- public int cxRightWidth; // width of right border that retains its size
- public int cyTopHeight; // height of top border that retains its size
- public int cyBottomHeight; // height of bottom border that retains its size
-};
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 96e66e684..e5f836130 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Native/NativeMethods.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Native/NativeMethods.cs
@@ -1,73 +1,43 @@
using System.Runtime.InteropServices;
-using System.Security;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.Graphics.Dwm;
+using Windows.Win32.UI.Controls;
+using Windows.Win32.UI.WindowsAndMessaging;
namespace DevToys.Windows.Native;
internal static partial class NativeMethods
{
- [SecurityCritical]
- [DllImport("ntdll.dll", SetLastError = true, CharSet = CharSet.Unicode)]
- [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
- [SuppressMessage("Interoperability", "SYSLIB1054:Use 'LibraryImportAttribute' instead of 'DllImportAttribute' to generate P/Invoke marshalling code at compile time", Justification = "Cannot marshal OSVERSIONINFOEX")]
- internal static extern int RtlGetVersion(out OSVERSIONINFOEX versionInfo);
-
- [LibraryImport("dwmapi.dll")]
- [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
- private static partial int DwmSetWindowAttribute(nint hwnd, DWMWINDOWATTRIBUTE dwAttribute, ref int pvAttribute, int cbAttribute);
-
- [LibraryImport("dwmapi.dll")]
- [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
- private static partial int DwmExtendFrameIntoClientArea(nint hwnd, ref MARGINS pMarInset);
-
- [LibraryImport("user32.dll", EntryPoint = "SetWindowLongA")]
- [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
- private static partial int SetWindowLong(nint hWnd, int nIndex, int dwNewLong);
-
- [LibraryImport("user32.dll", EntryPoint = "GetWindowLongPtrA")]
- [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
- private static partial int GetWindowLong(nint hWnd, int nIndex);
-
- [LibraryImport("user32.dll")]
- [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
- private static partial nint SetParent(nint hWndChild, nint hWndNewParent);
-
- [LibraryImport("user32.dll")]
- [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
- internal static partial nint GetDC(nint ptr);
-
- [LibraryImport(libraryName: "gdi32.dll", SetLastError = true)]
- [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
- internal static partial int GetDeviceCaps(nint hdc, int nIndex);
-
- [LibraryImport("user32.dll", SetLastError = true)]
- [DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
- internal static partial int ReleaseDC(nint window, nint dc);
-
- internal static int SetWindowAttribute(nint windowHandle, DWMWINDOWATTRIBUTE attribute, int parameter)
- {
- return DwmSetWindowAttribute(windowHandle, attribute, ref parameter, Marshal.SizeOf<int>());
- }
-
- internal static int ExtendFrame(nint windowHandle, MARGINS margins)
+ internal static unsafe HRESULT SetWindowAttribute(HWND windowHandle, DWMWINDOWATTRIBUTE attribute, ref int parameter)
{
- return DwmExtendFrameIntoClientArea(windowHandle, ref margins);
+#pragma warning disable CA1416 // Validate platform compatibility
+ fixed (void* value = &parameter)
+ {
+ return PInvoke.DwmSetWindowAttribute(windowHandle, attribute, value, (uint)Marshal.SizeOf<int>());
+ }
+#pragma warning restore CA1416 // Validate platform compatibility
}
- internal static int RoundWindowCorner(nint windowHandle, DWM_WINDOW_CORNER_PREFERENCE cornerPreference = DWM_WINDOW_CORNER_PREFERENCE.DWMWCP_ROUND)
+ internal static int ExtendFrame(HWND windowHandle, MARGINS margins)
{
- DWMWINDOWATTRIBUTE attribute = DWMWINDOWATTRIBUTE.DWMWA_WINDOW_CORNER_PREFERENCE;
- int preference = (int)cornerPreference;
- return DwmSetWindowAttribute(windowHandle, attribute, ref preference, sizeof(uint));
+#pragma warning disable CA1416 // Validate platform compatibility
+ return PInvoke.DwmExtendFrameIntoClientArea(windowHandle, in margins);
+#pragma warning restore CA1416 // Validate platform compatibility
}
- internal static void HideAllWindowButton(nint windowHandle)
+ internal static void HideAllWindowButton(HWND windowHandle)
{
- _ = SetWindowLong(windowHandle, HwndButtons.GWL_STYLE, GetWindowLong(windowHandle, HwndButtons.GWL_STYLE) & ~HwndButtons.WS_SYSMENU);
+#pragma warning disable CA1416 // Validate platform compatibility
+ _ = PInvoke.SetWindowLong(windowHandle, WINDOW_LONG_PTR_INDEX.GWL_STYLE, PInvoke.GetWindowLong(windowHandle, WINDOW_LONG_PTR_INDEX.GWL_STYLE) & ~HwndButtons.WS_SYSMENU);
+#pragma warning restore CA1416 // Validate platform compatibility
}
- internal static void SetWindowAsChildOf(nint windowHandleChild, nint windowHandleParent)
+ internal static void SetWindowAsChildOf(HWND windowHandleChild, HWND windowHandleParent)
{
- SetWindowLong(windowHandleChild, HwndButtons.GWL_STYLE, HwndSourceMessages.WS_CHILD);
- SetParent(windowHandleChild, windowHandleParent);
+#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
}
}
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Native/OSVERSIONINFOEX.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Native/OSVERSIONINFOEX.cs
deleted file mode 100644
index 1caca60f9..000000000
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Native/OSVERSIONINFOEX.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace DevToys.Windows.Native;
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct OSVERSIONINFOEX
-{
- internal int OSVersionInfoSize;
- internal int MajorVersion;
- internal int MinorVersion;
- internal int BuildNumber;
- internal int Revision;
- internal int PlatformId;
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
- internal string CSDVersion;
- internal ushort ServicePackMajor;
- internal ushort ServicePackMinor;
- internal short SuiteMask;
- internal byte ProductType;
- internal byte Reserved;
-}
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/NativeMethods.txt b/src/app/dev/platforms/desktop/DevToys.Windows/NativeMethods.txt
new file mode 100644
index 000000000..a01773bd5
--- /dev/null
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/NativeMethods.txt
@@ -0,0 +1,32 @@
+// Efficiency Mode
+GetCurrentProcess
+SetProcessInformation
+PROCESS_POWER_THROTTLING_STATE
+PROCESS_POWER_THROTTLING_CURRENT_VERSION
+PROCESS_POWER_THROTTLING_EXECUTION_SPEED
+SetPriorityClass
+
+// dwmapi
+DwmSetWindowAttribute
+DwmExtendFrameIntoClientArea
+
+// user32
+SetWindowLong
+GetWindowLong
+SetParent
+GetDC
+GetDeviceCaps
+ReleaseDC
+
+// Windows messages
+WM_NCHITTEST
+WM_NCLBUTTONDOWN
+WM_NCPAINT
+WM_ERASEBKGND
+WM_PAINT
+WM_GETMINMAXINFO
+WM_MOVING
+WM_SETCURSOR
+WM_GETTEXT
+WM_WINDOWPOSCHANGING
+WINDOW_STYLE
\ No newline at end of file
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/app.manifest b/src/app/dev/platforms/desktop/DevToys.Windows/app.manifest
index cd416b793..4e50017d2 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/app.manifest
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/app.manifest
@@ -54,8 +54,6 @@
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
- <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
- <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
</windowsSettings>
</application>
diff --git a/src/app/tests/DevToys.UnitTests/Api/Core/ObservableHashSetTests.cs b/src/app/tests/DevToys.UnitTests/Api/Core/ObservableHashSetTests.cs
index cde944035..91d7f3212 100644
--- a/src/app/tests/DevToys.UnitTests/Api/Core/ObservableHashSetTests.cs
+++ b/src/app/tests/DevToys.UnitTests/Api/Core/ObservableHashSetTests.cs
@@ -5,7 +5,7 @@ namespace DevToys.UnitTests.Api.Core;
public class ObservableHashSetTests
{
- private static readonly Random _random = new();
+ private static readonly Random random = new();
[Fact]
public void CanConstruct()
@@ -511,11 +511,11 @@ public class ObservableHashSetTests
private static List<int> CreateTestData(int minSize = 0, int maxLength = 1000)
{
- int length = _random.Next(minSize, maxLength);
+ int length = random.Next(minSize, maxLength);
var data = new List<int>();
for (int i = 0; i < length; i++)
{
- data.Add(_random.Next(int.MinValue, int.MaxValue));
+ data.Add(random.Next(int.MinValue, int.MaxValue));
}
return data;
diff --git a/src/app/tests/DevToys.UnitTests/Blazor/Core/Helpers/CssBuilderTests.cs b/src/app/tests/DevToys.UnitTests/Blazor/Core/Helpers/CssBuilderTests.cs
index c086d8c6d..b71682175 100644
--- a/src/app/tests/DevToys.UnitTests/Blazor/Core/Helpers/CssBuilderTests.cs
+++ b/src/app/tests/DevToys.UnitTests/Blazor/Core/Helpers/CssBuilderTests.cs
@@ -8,21 +8,21 @@ public class CssBuilderTests
public void ShouldConstructWithDefaultValue()
{
//arrange
- string ClassToRender = CssBuilder.Default("item-one").Build();
+ string classToRender = CssBuilder.Default("item-one").Build();
//assert
- ClassToRender.Should().Be("item-one");
+ classToRender.Should().Be("item-one");
}
[Fact]
public void ShouldConstructWithEmpty()
{
//arrange
- CssBuilder? ClassToRender = CssBuilder.Empty();
- ClassToRender = string.IsNullOrEmpty(ClassToRender.ToString()) ? null : ClassToRender;
+ CssBuilder? classToRender = CssBuilder.Empty();
+ classToRender = string.IsNullOrEmpty(classToRender.ToString()) ? null : classToRender;
//assert
- ClassToRender.Should().BeNull();
+ classToRender.Should().BeNull();
}
[Fact]
@@ -34,14 +34,14 @@ public class CssBuilderTests
Func<bool> hasFive = () => false;
//act
- string ClassToRender = new CssBuilder("item-one")
+ string classToRender = new CssBuilder("item-one")
.AddClass("item-two", when: hasTwo)
.AddClass("item-three", when: hasThree)
.AddClass("item-four")
.AddClass("item-five", when: hasFive)
.Build();
//assert
- ClassToRender.Should().Be("item-one item-three item-four");
+ classToRender.Should().Be("item-one item-three item-four");
}
[Fact]
@@ -53,7 +53,7 @@ public class CssBuilderTests
Func<bool> hasFive = () => false;
//act
- string ClassToRender = new CssBuilder("item-one")
+ string classToRender = new CssBuilder("item-one")
.AddClass("item-two", when: hasTwo)
.AddClass(new CssBuilder("item-three")
.AddClass("item-foo", false)
@@ -63,7 +63,7 @@ public class CssBuilderTests
.AddClass("item-five", when: hasFive)
.Build();
//assert
- ClassToRender.Should().Be("item-one item-three item-sub-three item-four");
+ classToRender.Should().Be("item-one item-three item-sub-three item-four");
}
[Fact]
@@ -73,11 +73,11 @@ public class CssBuilderTests
bool shouldShow = false;
//act
- string ClassToRender = new CssBuilder()
+ string classToRender = new CssBuilder()
.AddClass("some-class", shouldShow)
.Build();
//assert
- ClassToRender.Should().Be(string.Empty);
+ classToRender.Should().Be(string.Empty);
}
[Fact]
@@ -89,11 +89,11 @@ public class CssBuilderTests
IDictionary<string, object> attributes = new Dictionary<string, object> { { "class", "my-custom-class-1" } };
//act
- string ClassToRender = new CssBuilder("item-one")
+ string classToRender = new CssBuilder("item-one")
.AddClass(() => attributes["class"].ToString(), when: attributes.ContainsKey("class"))
.Build();
//assert
- ClassToRender.Should().Be("item-one my-custom-class-1");
+ classToRender.Should().Be("item-one my-custom-class-1");
}
}
@@ -106,11 +106,11 @@ public class CssBuilderTests
IDictionary<string, object> attributes = new Dictionary<string, object> { { "class", "my-custom-class-1" } };
//act
- string ClassToRender = new CssBuilder("item-one")
+ string classToRender = new CssBuilder("item-one")
.AddClassFromAttributes(attributes)
.Build();
//assert
- ClassToRender.Should().Be("item-one my-custom-class-1");
+ classToRender.Should().Be("item-one my-custom-class-1");
}
}
@@ -123,11 +123,11 @@ public class CssBuilderTests
IDictionary<string, object> attributes = null;
//act
- string ClassToRender = new CssBuilder("item-one")
+ string classToRender = new CssBuilder("item-one")
.AddClassFromAttributes(attributes)
.Build();
//assert
- ClassToRender.Should().Be("item-one");
+ classToRender.Should().Be("item-one");
}
}
@@ -140,12 +140,12 @@ public class CssBuilderTests
IDictionary<string, object> attributes = null;
//act
- CssBuilder? ClassToRender = new CssBuilder()
+ CssBuilder? classToRender = new CssBuilder()
.AddClassFromAttributes(attributes);
- ClassToRender = string.IsNullOrEmpty(ClassToRender.ToString()) ? null : ClassToRender;
+ classToRender = string.IsNullOrEmpty(classToRender.ToString()) ? null : classToRender;
//assert
- ClassToRender.Should().BeNull();
+ classToRender.Should().BeNull();
}
}
@@ -157,10 +157,10 @@ public class CssBuilderTests
IDictionary<string, object> attributes = new Dictionary<string, object> { { "foo", "bar" } };
//act
- string ClassToRender = new CssBuilder("item-one")
+ string classToRender = new CssBuilder("item-one")
.AddClass(() => attributes["string"].ToString(), when: attributes.ContainsKey("class"))
.Build();
//assert
- ClassToRender.Should().Be("item-one");
+ classToRender.Should().Be("item-one");
}
}
diff --git a/src/app/tests/DevToys.UnitTests/Blazor/Core/Helpers/StyleBuilderTests.cs b/src/app/tests/DevToys.UnitTests/Blazor/Core/Helpers/StyleBuilderTests.cs
index d39292eba..1b072cca0 100644
--- a/src/app/tests/DevToys.UnitTests/Blazor/Core/Helpers/StyleBuilderTests.cs
+++ b/src/app/tests/DevToys.UnitTests/Blazor/Core/Helpers/StyleBuilderTests.cs
@@ -17,14 +17,14 @@ public class StyleBuilderTests
int right = 20;
//act
- string ClassToRender = new StyleBuilder("background-color", "DodgerBlue")
+ string classToRender = new StyleBuilder("background-color", "DodgerBlue")
.AddStyle("border-width", $"{top.ToPx()} {right.ToPx()} {bottom.ToPx()} {left.ToPx()}", when: hasBorder)
.AddStyle("z-index", "999", when: isOnTop)
.AddStyle("z-index", "-1", when: !isOnTop)
.AddStyle("padding", "35px")
.Build();
//assert
- ClassToRender.Should().Be("background-color:DodgerBlue;border-width:2px 20px 10px 4px;z-index:-1;padding:35px;");
+ classToRender.Should().Be("background-color:DodgerBlue;border-width:2px 20px 10px 4px;z-index:-1;padding:35px;");
}
[Fact]
@@ -39,56 +39,56 @@ public class StyleBuilderTests
int right = 20;
//act
- string StyleToRender = new StyleBuilder("background-color", "DodgerBlue")
+ string styleToRender = new StyleBuilder("background-color", "DodgerBlue")
.AddStyle("border-width", $"{top}px {right}px {bottom}px {left}px", when: hasBorder)
.AddStyle("z-index", "999", when: isOnTop)
.AddStyle("z-index", "-1", when: !isOnTop)
.AddStyle("padding", "35px")
.Build();
- IDictionary<string, object> attributes = new Dictionary<string, object> { { "style", StyleToRender } };
+ IDictionary<string, object> attributes = new Dictionary<string, object> { { "style", styleToRender } };
- string ClassToRender = new StyleBuilder().AddStyleFromAttributes(attributes).Build();
+ string classToRender = new StyleBuilder().AddStyleFromAttributes(attributes).Build();
//assert
- ClassToRender.Should().Be("background-color:DodgerBlue;border-width:2px 20px 10px 4px;z-index:-1;padding:35px;");
+ classToRender.Should().Be("background-color:DodgerBlue;border-width:2px 20px 10px 4px;z-index:-1;padding:35px;");
}
[Fact]
public void ShouldAddExistingStyle()
{
- string StyleToRender = StyleBuilder.Empty()
+ string styleToRender = StyleBuilder.Empty()
.AddStyle("background-color:DodgerBlue;")
.AddStyle("padding", "35px")
.Build();
- string StyleToRenderFromDefaultConstructor = StyleBuilder.Default(StyleToRender).Build();
+ string styleToRenderFromDefaultConstructor = StyleBuilder.Default(styleToRender).Build();
/// Double ;; is valid HTML.
/// The CSS syntax allows for empty declarations, which means that you can add leading and trailing semicolons as you like. For instance, this is valid CSS
/// .foo { ;;;display:none;;;color:black;;; }
/// Trimming is possible, but is it worth the operations for a non-issue?
- StyleToRender.Should().Be("background-color:DodgerBlue;;padding:35px;");
- StyleToRenderFromDefaultConstructor.Should().Be("background-color:DodgerBlue;;padding:35px;;");
+ styleToRender.Should().Be("background-color:DodgerBlue;;padding:35px;");
+ styleToRenderFromDefaultConstructor.Should().Be("background-color:DodgerBlue;;padding:35px;;");
}
[Fact]
public void ShouldNotAddEmptyStyle()
{
- StyleBuilder? StyleToRender = StyleBuilder.Empty().AddStyle("");
- StyleToRender = string.IsNullOrEmpty(StyleToRender.ToString()) ? null : StyleToRender;
+ StyleBuilder? styleToRender = StyleBuilder.Empty().AddStyle("");
+ styleToRender = string.IsNullOrEmpty(styleToRender.ToString()) ? null : styleToRender;
- StyleToRender.Should().BeNull();
+ styleToRender.Should().BeNull();
}
[Fact]
public void ShouldAddNestedStyles()
{
- StyleBuilder Child = StyleBuilder.Empty()
+ StyleBuilder child = StyleBuilder.Empty()
.AddStyle("background-color", "DodgerBlue")
.AddStyle("padding", "35px");
- string StyleToRender = StyleBuilder.Empty()
- .AddStyle(Child)
+ string styleToRender = StyleBuilder.Empty()
+ .AddStyle(child)
.AddStyle("z-index", "-1")
.Build();
@@ -96,14 +96,14 @@ public class StyleBuilderTests
/// The CSS syntax allows for empty declarations, which means that you can add leading and trailing semicolons as you like. For instance, this is valid CSS
/// .foo { ;;;display:none;;;color:black;;; }
/// Trimming is possible, but is it worth the operations for a non-issue?
- StyleToRender.Should().Be("background-color:DodgerBlue;padding:35px;z-index:-1;");
+ styleToRender.Should().Be("background-color:DodgerBlue;padding:35px;z-index:-1;");
}
[Fact]
public void ShouldAddComplexStyles()
{
- string StyleToRender = StyleBuilder.Empty()
+ string styleToRender = StyleBuilder.Empty()
.AddStyle("text-decoration", v => v
.AddValue("underline", true)
.AddValue("overline", false)
@@ -116,7 +116,7 @@ public class StyleBuilderTests
/// The CSS syntax allows for empty declarations, which means that you can add leading and trailing semicolons as you like. For instance, this is valid CSS
/// .foo { ;;;display:none;;;color:black;;; }
/// Trimming is possible, but is it worth the operations for a non-issue?
- StyleToRender.Should().Be("text-decoration:underline line-through;z-index:-1;");
+ styleToRender.Should().Be("text-decoration:underline line-through;z-index:-1;");
}
[Fact]
@@ -127,11 +127,11 @@ public class StyleBuilderTests
IReadOnlyDictionary<string, object> attributes = new Dictionary<string, object> { { "class", "my-custom-class-1" } };
//act
- string StyleToRender = StyleBuilder.Empty()
+ string styleToRender = StyleBuilder.Empty()
.AddStyle("background-color", () => attributes["style"].ToString(), when: attributes.ContainsKey("style"))
.AddStyle("background-color", "black")
.Build();
//assert
- StyleToRender.Should().Be("background-color:black;");
+ styleToRender.Should().Be("background-color:black;");
}
}