From cb4c3ff95d5356827ad1eee662d6db0fde55b347 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Thu, 28 May 2026 22:42:32 +0200 Subject: [PATCH] Break the toolbar Sort / Collapse order tie SortAssemblyListCommand and CollapseAllCommand both left ToolbarOrder at its default of 0, so their relative position on the toolbar fell out of MEF discovery order. Make it explicit: Sort = 0, Collapse = 1. Assisted-by: Claude:claude-opus-4-7:Claude Code --- ILSpy/Commands/ViewCommands.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ILSpy/Commands/ViewCommands.cs b/ILSpy/Commands/ViewCommands.cs index 54ba029de..7d2fe9576 100644 --- a/ILSpy/Commands/ViewCommands.cs +++ b/ILSpy/Commands/ViewCommands.cs @@ -25,7 +25,7 @@ using ILSpy.AssemblyTree; namespace ILSpy.Commands { [ExportMainMenuCommand(ParentMenuID = nameof(Resources._View), Header = nameof(Resources.SortAssembly_listName), MenuIcon = "Images/Sort", MenuCategory = "Tree", MenuOrder = 10)] - [ExportToolbarCommand(ToolTip = nameof(Resources.SortAssemblyListName), ToolbarIcon = "Images/Sort", ToolbarCategory = nameof(Resources.View))] + [ExportToolbarCommand(ToolTip = nameof(Resources.SortAssemblyListName), ToolbarIcon = "Images/Sort", ToolbarCategory = nameof(Resources.View), ToolbarOrder = 0)] [Shared] [method: ImportingConstructor] sealed class SortAssemblyListCommand(AssemblyTreeModel assemblyTreeModel) : SimpleCommand @@ -34,7 +34,7 @@ namespace ILSpy.Commands } [ExportMainMenuCommand(ParentMenuID = nameof(Resources._View), Header = nameof(Resources._CollapseTreeNodes), MenuIcon = "Images/CollapseAll", MenuCategory = "Tree", MenuOrder = 11)] - [ExportToolbarCommand(ToolTip = nameof(Resources.CollapseTreeNodes), ToolbarIcon = "Images/CollapseAll", ToolbarCategory = nameof(Resources.View))] + [ExportToolbarCommand(ToolTip = nameof(Resources.CollapseTreeNodes), ToolbarIcon = "Images/CollapseAll", ToolbarCategory = nameof(Resources.View), ToolbarOrder = 1)] [Shared] [method: ImportingConstructor] sealed class CollapseAllCommand(AssemblyTreeModel assemblyTreeModel) : SimpleCommand