Skip to content

A Swiss Army knife for developers.

merged

Benjamin Titeux796dbacbd4fa
diff --cc src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
index 6c4701274,802f7a45d..a08403198
--- a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
+++ b/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
@@@ -66,8 -68,60 +68,42 @@@ namespace DevTools.Impl.ViewModel
internal MatchedToolProviderViewData? SelectedMenuItem
{
get => _selectedItem;
- set
- {
- _thread.ThrowIfNotOnUIThread();
- if (_isUpdatingSelectedItem)
- {
- return;
- }
-
- _isUpdatingSelectedItem = true;
- if (value is not null)
- {
- _selectedItem = value;
-
- IToolViewModel toolViewModel = _toolProviderFactory.GetToolViewModel(_selectedItem.ToolProvider);
- Messenger.Send(new NavigateToToolMessage(toolViewModel));
-
- OnPropertyChanged();
- OnPropertyChanged(nameof(HeaderText));
- }
- _isUpdatingSelectedItem = false;
- }
+ set => SetSelectedMenuItem(value, null);
+ }
++ }
+ }
+
+ /// <summary>
+ /// Gets the text to show in the header of the app. The property returned null when is in compact overlay mode.
+ /// </summary>
+ internal string? HeaderText
+ {
+ get
+ {
+ if (IsInCompactOverlayMode)
+ {
+ return null;
+ }
+
+ return SelectedMenuItem?.ToolProvider.DisplayName;
+ }
+ }
+
+ /// <summary>
+ /// Gets the text to show in the header of the app. The property returned null when is in compact overlay mode.
+ /// </summary>
+ internal string? WindowTitle
+ {
+ get
+ {
+ if (IsInCompactOverlayMode)
+ {
+ return Strings.GetFormattedWindowTitleWithToolName(SelectedMenuItem?.ToolProvider.DisplayName);
+ }
+
+ return Strings.WindowTitle;
+ }
+ }
/// <summary>
/// Gets or sets search query in the search bar.
@@@ -227,31 -322,14 +304,33 @@@
}
}
- await _thread.RunOnUIThreadAsync(() =>
- {
- SelectedMenuItem = toolProviderViewDataToSelect ?? ToolsMenuItems.FirstOrDefault() ?? FooterMenuItems.FirstOrDefault();
- });
+ await _thread.RunOnUIThreadAsync(
+ ThreadPriority.Low,
+ () =>
+ {
+ SelectedMenuItem = toolProviderViewDataToSelect ?? ToolsMenuItems.FirstOrDefault() ?? FooterMenuItems.FirstOrDefault();
+ });
}
+ private void SetSelectedMenuItem(MatchedToolProviderViewData? value, string? clipboardContentData)
+ {
+ _thread.ThrowIfNotOnUIThread();
+ if (_isUpdatingSelectedItem)
+ {
+ return;
+ }
+
+ _isUpdatingSelectedItem = true;
+ if (value is not null)
+ {
+ _selectedItem = value;
+ IToolViewModel toolViewModel = _toolProviderFactory.GetToolViewModel(_selectedItem.ToolProvider);
+ Messenger.Send(new NavigateToToolMessage(toolViewModel, clipboardContentData));
+ OnPropertyChanged(nameof(SelectedMenuItem));
+ }
+ _isUpdatingSelectedItem = false;
+ }
+
private async Task UpdateMenuAsync(string? searchQuery)
{
await TaskScheduler.Default;
@@@ -381,14 -461,15 +462,16 @@@
// The recommended tool is displayed in the top menu.
// The recommended tool is different that the ones that were recommended before (if any...).
// Let's select automatically this tool.
- await _thread.RunOnUIThreadAsync(() =>
- {
- if (!IsInCompactOverlayMode && _allowSelectAutomaticallyRecommendedTool)
+ await _thread.RunOnUIThreadAsync(
- ThreadPriority.High,
++ ThreadPriority.High,
+ () =>
{
- SelectedMenuItem = recommendedTools[0];
- SetSelectedMenuItem(recommendedTools[0], clipboardContent);
- }
- });
+ if (!IsInCompactOverlayMode && _allowSelectAutomaticallyRecommendedTool)
+ {
+ SelectedMenuItem = recommendedTools[0];
++ SetSelectedMenuItem(recommendedTools[0], clipboardContent);
+ }
+ });
}
}
}
diff --cc src/dev/startup/DevTools/App.xaml.cs
index 47009f5dc,0f1eb39a1..292d6d8bd
--- a/src/dev/startup/DevTools/App.xaml.cs
+++ b/src/dev/startup/DevTools/App.xaml.cs
@@@ -103,9 -111,8 +111,9 @@@ namespace DevTool
rootFrame.Navigate(
typeof(MainPage),
new NavigationParameter(
- _mefComposer.ExportProvider.GetExport<IMefProvider>(),
+ mefComposer.ExportProvider.GetExport<IMefProvider>(),
- e.Arguments));
+ viewModel: null,
+ query: e.Arguments));
}
// Ensure the current window is active