A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Minor perf and visual fix
Etienne Baudoux4b2f39f0dbae
diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIFileSelector.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIFileSelector.csindex 39c325691..0e26bec24 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIFileSelector.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIFileSelector.cs@@ -65,7 +65,7 @@ internal sealed class UIFileSelector : UIElement, IUIFileSelectorfor (int i = 0; i < value.Length; i++){string fileExtension = Path.GetExtension(value[i].FileName);- if (!AllowedFileExtensions.All(ext => !string.Equals(ext, fileExtension, StringComparison.CurrentCultureIgnoreCase)))+ if (AllowedFileExtensions.All(ext => !string.Equals(ext, fileExtension, StringComparison.CurrentCultureIgnoreCase))){ThrowHelper.ThrowInvalidOperationException($"File extension '{fileExtension}' is not allowed.");}diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIGrid.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIGrid.csindex 6afed85be..20e2220b0 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIGrid.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIGrid.cs@@ -234,6 +234,15 @@ public static partial class GUIreturn element;}+ /// <summary>+ /// Sets no spacing between rows.+ /// </summary>+ public static IUIGrid RowNoSpacing(this IUIGrid element)+ {+ ((UIGrid)element).RowSpacing = UISpacing.None;+ return element;+ }+/// <summary>/// Sets a small spacing between rows./// </summary>@@ -261,6 +270,15 @@ public static partial class GUIreturn element;}+ /// <summary>+ /// Sets no spacing between columns.+ /// </summary>+ public static IUIGrid ColumnNoSpacing(this IUIGrid element)+ {+ ((UIGrid)element).ColumnSpacing = UISpacing.None;+ return element;+ }+/// <summary>/// Sets a small spacing between columns./// </summary>diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIList.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIList.csindex c35cee05d..6d257f144 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIList.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIList.cs@@ -238,6 +238,10 @@ public static partial class GUIif (item is not null){listItems.Remove(item);+ if (item is IDisposable disposable)+ {+ disposable.Dispose();+ }}}}diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIStack.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIStack.csindex 982ea90a1..8818748e3 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIStack.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIStack.cs@@ -135,6 +135,15 @@ public static partial class GUIreturn element;}+ /// <summary>+ /// Sets no spacing between children.+ /// </summary>+ public static IUIStack NoSpacing(this IUIStack element)+ {+ ((UIStack)element).Spacing = UISpacing.None;+ return element;+ }+/// <summary>/// Sets a small spacing between children./// </summary>diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIWrap.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIWrap.csindex e4e3ad88b..b8f28adf1 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIWrap.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/IUIWrap.cs@@ -97,6 +97,15 @@ public static partial class GUIreturn element;}+ /// <summary>+ /// Sets no spacing between children.+ /// </summary>+ public static IUIWrap NoSpacing(this IUIWrap element)+ {+ ((UIWrap)element).Spacing = UISpacing.None;+ return element;+ }+/// <summary>/// Sets a small spacing between children./// </summary>diff --git a/src/app/dev/DevToys.Api/Tool/GUI/Components/UISpacing.cs b/src/app/dev/DevToys.Api/Tool/GUI/Components/UISpacing.csindex 24d375794..b6951cd4d 100644--- a/src/app/dev/DevToys.Api/Tool/GUI/Components/UISpacing.cs+++ b/src/app/dev/DevToys.Api/Tool/GUI/Components/UISpacing.cs@@ -5,18 +5,23 @@/// </summary>public enum UISpacing{+ /// <summary>+ /// No space between element. Use this space between element or text that should be closed from each other.+ /// </summary>+ None = 0,+/// <summary>/// A small space between element. Use this space between elements of a same group./// </summary>- Small = 0,+ Small = 1,/// <summary>/// A medium space between element. Use this space to separate groups of elements./// </summary>- Medium = 1,+ Medium = 2,/// <summary>/// A large space between element. Use this space to separate sections./// </summary>- Large = 2+ Large = 3}diff --git a/src/app/dev/DevToys.Blazor/Components/Text/TextBlock/TextBlock.razor.scss b/src/app/dev/DevToys.Blazor/Components/Text/TextBlock/TextBlock.razor.scssindex 1751d97c1..32437c978 100644--- a/src/app/dev/DevToys.Blazor/Components/Text/TextBlock/TextBlock.razor.scss+++ b/src/app/dev/DevToys.Blazor/Components/Text/TextBlock/TextBlock.razor.scss@@ -34,6 +34,7 @@&caption {line-height: 16px;letter-spacing: 0.3px;+ color: var(--text-fill-color-secondary);font: {size: var(--font-size-caption);diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIGridPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIGridPresenter.razorindex b3d40e9e6..6ca0ff3ea 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIGridPresenter.razor+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIGridPresenter.razor@@ -7,8 +7,8 @@IsEnabled="@UIGrid.IsEnabled"HorizontalAlignment="@UIGrid.HorizontalAlignment"VerticalAlignment="@UIGrid.VerticalAlignment"- RowSpacing="@(UIGrid.RowSpacing == UISpacing.Small ? 4 : (UIGrid.RowSpacing == UISpacing.Medium ? 8 : 12))"- ColumnSpacing="@(UIGrid.ColumnSpacing == UISpacing.Small ? 4 : (UIGrid.ColumnSpacing == UISpacing.Medium ? 8 : 12))"+ RowSpacing="@(UIGrid.RowSpacing.ToPxInteger())"+ ColumnSpacing="@(UIGrid.ColumnSpacing.ToPxInteger())"Rows="@UIGrid.Rows"Columns="@UIGrid.Columns">@if (UIGrid.Cells is not null)diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIStackPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIStackPresenter.razorindex 37e8b3a7a..d6680d469 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIStackPresenter.razor+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIStackPresenter.razor@@ -8,7 +8,7 @@HorizontalAlignment="@UIStack.HorizontalAlignment"VerticalAlignment="@UIStack.VerticalAlignment"Orientation="@UIStack.Orientation"- Spacing="@(UIStack.Spacing == UISpacing.Small ? 4 : (UIStack.Spacing == UISpacing.Medium ? 8 : 12))">+ Spacing="@(UIStack.Spacing.ToPxInteger())">@if (UIStack.Children is not null){for (int i = 0; i < UIStack.Children.Length; i++)diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIWrapPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIWrapPresenter.razorindex 448c5279b..9379d1bf0 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIWrapPresenter.razor+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIWrapPresenter.razor@@ -9,7 +9,7 @@VerticalAlignment="@UIWrap.VerticalAlignment"Orientation="UIOrientation.Horizontal"Wrap="true"- Spacing="@(UIWrap.Spacing == UISpacing.Small ? 4 : (UIWrap.Spacing == UISpacing.Medium ? 8 : 12))">+ Spacing="@(UIWrap.Spacing.ToPxInteger())">@if (UIWrap.Children is not null){for (int i = 0; i < UIWrap.Children.Length; i++)diff --git a/src/app/dev/DevToys.Blazor/Core/Extensions/WebUnitsExtensions.cs b/src/app/dev/DevToys.Blazor/Core/Extensions/WebUnitsExtensions.csindex 63d9d7d62..3725d0ac8 100644--- a/src/app/dev/DevToys.Blazor/Core/Extensions/WebUnitsExtensions.cs+++ b/src/app/dev/DevToys.Blazor/Core/Extensions/WebUnitsExtensions.cs@@ -16,6 +16,18 @@ internal static class WebUnitsExtensionsinternal static string ToPx(this double? val) => val != null ? val.Value.ToPx() : string.Empty;+ internal static int ToPxInteger(this UISpacing val)+ {+ return val switch+ {+ UISpacing.None => 0,+ UISpacing.Small => 4,+ UISpacing.Medium => 8,+ UISpacing.Large => 12,+ _ => throw new NotSupportedException()+ };+ }+internal static string ToPercentage(this int val) => $"{val}%";internal static string ToPercentage(this int? val) => val != null ? val.Value.ToPercentage() : string.Empty;diff --git a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor.scss b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor.scssindex b6b131c12..4de08bd72 100644--- a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor.scss+++ b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor.scss@@ -40,7 +40,6 @@margin-left: 16px;margin-top: 2px;margin-right: 8px;- color: var(--text-fill-color-secondary);overflow: hidden;display: -webkit-box;-webkit-line-clamp: 5;diff --git a/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs b/src/app/dev/DevToys.Core/Tools/GuiToolProvider.csindex 2715f1fa0..df2b7f615 100644--- a/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs+++ b/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs@@ -409,7 +409,11 @@ public sealed partial class GuiToolProvidervar bodyToolInstances = new List<GuiToolInstance>();// Order all the tools.- guiTools = ExtensionOrderer.Order(guiTools.OrderBy(tool => tool.Metadata.MenuPlacement));+ guiTools+ = ExtensionOrderer.Order(+ guiTools+ .OrderBy(tool => tool.Metadata.MenuPlacement)+ .ThenBy(tool => tool.Metadata.InternalComponentName));foreach (Lazy<IGuiTool, GuiToolMetadata> guiToolDefinition in guiTools){@@ -583,7 +587,10 @@ public sealed partial class GuiToolProvider}// Order tools groups.- IEnumerable<GroupViewItem> orderedGroups = ExtensionOrderer.Order(groups.Values).Select(g => g.Value);+ IEnumerable<GroupViewItem> orderedGroups+ = ExtensionOrderer.Order(+ groups.Values.OrderBy(g => g.Value.DisplayTitle))+ .Select(g => g.Value);return orderedGroups;}