Skip to content

A Swiss Army knife for developers.

Added TaskBar jump list support.

Etienne Baudoux9162fee1bdaf
diff --git a/src/app/dev/DevToys.Blazor/Components/Feedback/FontIcon/FontIcon.razor.cs b/src/app/dev/DevToys.Blazor/Components/Feedback/FontIcon/FontIcon.razor.cs
index 34a407d94..c16611353 100644
--- a/src/app/dev/DevToys.Blazor/Components/Feedback/FontIcon/FontIcon.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/Feedback/FontIcon/FontIcon.razor.cs
@@ -7,6 +7,7 @@ public partial class FontIcon : StyledComponentBase
.AddStyle("width", Width.ToPx())
.AddStyle("font-size", Width.ToPx())
.AddStyle("line-height", Height.ToPx())
+ .AddStyle("transform", $"rotate({Rotation}deg)", Rotation != 0)
.AddStyle(Style)
.Build();
@@ -24,6 +25,9 @@ public partial class FontIcon : StyledComponentBase
[Parameter]
public string FontFamily { get; set; } = "FluentSystemIcons";
+ [Parameter]
+ public int Rotation { get; set; }
+
protected override void OnParametersSet()
{
CSS.Clear();
diff --git a/src/app/dev/DevToys.Blazor/Pages/Index.razor b/src/app/dev/DevToys.Blazor/Pages/Index.razor
index 44c8a362e..a0d0e91b0 100644
--- a/src/app/dev/DevToys.Blazor/Pages/Index.razor
+++ b/src/app/dev/DevToys.Blazor/Pages/Index.razor
@@ -66,10 +66,10 @@
Height="32"
IsEnabled="@compactOverlayModeAllowed"
IsVisible="@WindowService.IsCompactOverlayModeSupportedByPlatform"
- ToolTip="Picture in picture"
+ ToolTip="@(WindowService.IsCompactOverlayMode ? "Back to full view" : "Keep on top")"
@onclick="@OnToggleCompactOverlayModeButtonClick">
- <!-- TODO: Change FontIcon to support "Rotation" parameter, and change the icon to -->
- <FontIcon Glyph="@(WindowService.IsCompactOverlayMode ? '\uE97C' : '\uE97F')" />
+ <FontIcon Glyph="@(WindowService.IsCompactOverlayMode ? '\uF42C' : '\uF364')"
+ Rotation="@(WindowService.IsCompactOverlayMode ? -90 : 180)"/>
</Button>
</StackPanel>
</HeaderRight>
diff --git a/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs b/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs
index 7e9b46bad..2b3e9a3be 100644
--- a/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs
@@ -45,7 +45,7 @@ public partial class Index : MefComponentBase
{
base.OnInitialized();
ViewModel.SelectedMenuItemChanged += ViewModel_SelectedMenuItemChanged;
- ViewModel.SelectedMenuItem = ViewModel.HeaderAndBodyToolViewItems[0];
+ ViewModel.SelectedMenuItem ??= ViewModel.HeaderAndBodyToolViewItems[0];
ContextMenuService.IsContextMenuOpenedChanged += ContextMenuService_IsContextMenuOpenedChanged;
WindowService.WindowActivated += WindowService_WindowActivated;
WindowService.WindowDeactivated += WindowService_WindowDeactivated;
diff --git a/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs b/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs
index da85dbad9..51d05e913 100644
--- a/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs
+++ b/src/app/dev/DevToys.Core/Tools/GuiToolProvider.cs
@@ -77,7 +77,7 @@ public sealed partial class GuiToolProvider
/// <summary>
/// Gets a hierarchical list containing all the tools available, ordered, to display in the top and body menu.
- /// This includes "All tools" menu item, recents and favorites.
+ /// This includes "All tools" menu item, recent and favorites.
/// </summary>
public ReadOnlyObservableCollection<INotifyPropertyChanged?> HeaderAndBodyToolViewItems
{
@@ -114,6 +114,11 @@ public sealed partial class GuiToolProvider
}
}
+ /// <summary>
+ /// Raised when the list of favorite tools changed.
+ /// </summary>
+ public event EventHandler? FavoriteToolsChanged;
+
/// <summary>
/// Sets a tool as the most recently used one.
/// </summary>
@@ -236,6 +241,8 @@ public sealed partial class GuiToolProvider
}
}
}
+
+ FavoriteToolsChanged?.Invoke(this, EventArgs.Empty);
}
/// <summary>
@@ -371,6 +378,16 @@ public sealed partial class GuiToolProvider
}
}
+ public GuiToolInstance? GetToolFromInternalName(string name)
+ {
+ if (string.IsNullOrEmpty(name))
+ {
+ return null;
+ }
+
+ return AllTools.FirstOrDefault(t => string.Equals(t.InternalComponentName, name, StringComparison.Ordinal));
+ }
+
private void BuildGuiToolInstances(
IEnumerable<Lazy<IGuiTool, GuiToolMetadata>> guiTools,
out IReadOnlyList<GuiToolInstance> allTools,
@@ -573,16 +590,6 @@ public sealed partial class GuiToolProvider
throw new InvalidDataException($"Unable to find the {nameof(ToolDisplayInformationAttribute.ResourceManagerAssemblyIdentifier)} '{resourceManagerAssemblyIdentifier}'.");
}
- private GuiToolInstance? GetToolFromInternalName(string name)
- {
- if (string.IsNullOrEmpty(name))
- {
- return null;
- }
-
- return AllTools.FirstOrDefault(t => string.Equals(t.InternalComponentName, name, StringComparison.Ordinal));
- }
-
private GroupViewItem CreateFavoriteGroupViewItem(IReadOnlyList<GuiToolViewItem> favoriteTools)
{
Guard.IsNull(_favoriteToolsGroupViewItem);
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Core/TaskbarJumpListService.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/TaskbarJumpListService.cs
new file mode 100644
index 000000000..eb44db1d1
--- /dev/null
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/TaskbarJumpListService.cs
@@ -0,0 +1,100 @@
+using System.Windows.Shell;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Messaging;
+using DevToys.Api;
+using DevToys.Business.ViewModels;
+using DevToys.Core.Models;
+using DevToys.Core.Tools;
+using DevToys.Windows.Helpers;
+
+namespace DevToys.Windows.Core;
+
+[Export(typeof(TaskbarJumpListService))]
+internal class TaskbarJumpListService : ObservableRecipient
+{
+ private const string ToolArgument = "--tool:";
+
+ private readonly GuiToolProvider _guiToolProvider;
+ private readonly IMefProvider _mefProvider;
+
+ [ImportingConstructor]
+ public TaskbarJumpListService(GuiToolProvider guiToolProvider, IMefProvider mefProvider)
+ {
+ _mefProvider = mefProvider;
+ _guiToolProvider = guiToolProvider;
+ _guiToolProvider.FavoriteToolsChanged += GuiToolProvider_FavoriteToolsChanged;
+
+ RefreshJumpListAsync().Forget();
+
+ HandleOpenWithJumpList();
+ }
+
+ private void GuiToolProvider_FavoriteToolsChanged(object? sender, EventArgs e)
+ {
+ RefreshJumpListAsync().Forget();
+ }
+
+ private void HandleOpenWithJumpList()
+ {
+ if (Environment.CommandLine.Contains(ToolArgument))
+ {
+ string toolName = Environment.CommandLine.Substring(Environment.CommandLine.IndexOf(ToolArgument) + ToolArgument.Length);
+ GuiToolInstance? tool = _guiToolProvider.GetToolFromInternalName(toolName);
+ if (tool is not null)
+ {
+ // Make sure MainWindowViewModel is initialized.
+ _mefProvider.Import<MainWindowViewModel>();
+ Messenger.Send(new ChangeSelectedMenuItemMessage(tool));
+ }
+ }
+ }
+
+ private Task RefreshJumpListAsync()
+ {
+ return ThreadHelper.RunOnUIThreadAsync(() =>
+ {
+ var jumpList = JumpList.GetJumpList(System.Windows.Application.Current);
+ if (jumpList is null)
+ {
+ jumpList = new JumpList();
+ JumpList.SetJumpList(System.Windows.Application.Current, jumpList);
+ }
+
+ ClearJumpList(jumpList);
+
+ for (int i = 0; i < _guiToolProvider.AllTools.Count; i++)
+ {
+ GuiToolInstance tool = _guiToolProvider.AllTools[i];
+ if (_guiToolProvider.GetToolIsFavorite(tool))
+ {
+ // TODO: Localize.
+ AddToolToJumpList(jumpList, tool, "Favorite tools");
+ }
+ }
+
+ jumpList.Apply();
+ });
+ }
+
+ private static void ClearJumpList(JumpList jumpList)
+ {
+ ThreadHelper.ThrowIfNotOnUIThread();
+
+ jumpList.JumpItems.Clear();
+ }
+
+ private static void AddToolToJumpList(JumpList jumpList, GuiToolInstance tool, string category)
+ {
+ ThreadHelper.ThrowIfNotOnUIThread();
+
+ var jumpTask = new JumpTask
+ {
+ Title = tool.LongOrShortDisplayTitle,
+ Description = tool.Description,
+ CustomCategory = category,
+ Arguments = $"{ToolArgument}{tool.InternalComponentName}"
+ };
+
+ jumpList.JumpItems.Add(jumpTask);
+ }
+}
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 eccf43a3d..db5aff985 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs
@@ -114,6 +114,8 @@ public partial class MainWindow : MicaWindowWithOverlay
blazorWebView.Focus();
blazorWebView.WebView.Focus();
LogUiLoadTime((DateTime.Now - _uiLoadingTime).TotalMilliseconds);
+
+ InitializeLowPriorityServices();
}
private static void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)
@@ -163,6 +165,12 @@ public partial class MainWindow : MicaWindowWithOverlay
return serviceProvider;
}
+ private void InitializeLowPriorityServices()
+ {
+ // Start the Taskbar Jump List service after the web view loaded.
+ _mefComposer.Provider.Import<TaskbarJumpListService>();
+ }
+
private void LogUnhandledException(Exception exception)
{
_logger?.LogCritical(0, exception, "Unhandled exception !!! (╯°□°)╯︵ ┻━┻");