Skip to content

A Swiss Army knife for developers.

Added tool header

Etienne Baudouxef0b8da52e59
diff --git a/src/app/dev/DevToys.UI/ViewModels/MainWindowViewModel.cs b/src/app/dev/DevToys.UI/ViewModels/MainWindowViewModel.cs
index 7a918b750..f3af59f5d 100644
--- a/src/app/dev/DevToys.UI/ViewModels/MainWindowViewModel.cs
+++ b/src/app/dev/DevToys.UI/ViewModels/MainWindowViewModel.cs
@@ -6,10 +6,12 @@ using DevToys.Core.Tools.ViewItems;
namespace DevToys.UI.ViewModels;
[Export(typeof(MainWindowViewModel))]
-internal sealed class MainWindowViewModel : ObservableRecipient
+internal sealed partial class MainWindowViewModel : ObservableRecipient
{
private readonly GuiToolProvider _guiToolProvider;
+ private INotifyPropertyChanged? _selectedMenuItem;
+
[ImportingConstructor]
public MainWindowViewModel(GuiToolProvider guiToolProvider)
{
@@ -20,10 +22,44 @@ internal sealed class MainWindowViewModel : ObservableRecipient
/// 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.
/// </summary>
- public ReadOnlyObservableCollection<INotifyPropertyChanged> HeaderAndBodyToolViewItems => _guiToolProvider.HeaderAndBodyToolViewItems;
+ internal ReadOnlyObservableCollection<INotifyPropertyChanged> HeaderAndBodyToolViewItems => _guiToolProvider.HeaderAndBodyToolViewItems;
/// <summary>
/// Gets a flat list containing all the footer tools available, ordered.
/// </summary>
- public ReadOnlyObservableCollection<GuiToolViewItem> FooterToolViewItems => _guiToolProvider.FooterToolViewItems;
+ internal ReadOnlyObservableCollection<GuiToolViewItem> FooterToolViewItems => _guiToolProvider.FooterToolViewItems;
+
+ // Can't use CommunityToolkit.MVVM due to https://github.com/dotnet/roslyn/issues/57239#issuecomment-1437895948
+ /// <summary>
+ /// Gets or sets the selected menu item in the NavitationView.
+ /// </summary>
+ internal INotifyPropertyChanged? SelectedMenuItem
+ {
+ get => _selectedMenuItem;
+ set
+ {
+ SetProperty(ref _selectedMenuItem, value);
+ OnPropertyChanged(nameof(HeaderText));
+ }
+ }
+
+ /// <summary>
+ /// Gets the text to show in the header of the app.
+ /// </summary>
+ internal string? HeaderText
+ {
+ get
+ {
+ if (SelectedMenuItem is GuiToolViewItem guiToolViewItem)
+ {
+ return guiToolViewItem.ToolInstance.LongDisplayTitle;
+ }
+ else if (SelectedMenuItem is GroupViewItem groupViewItem)
+ {
+ return groupViewItem.DisplayTitle;
+ }
+
+ return string.Empty;
+ }
+ }
}
diff --git a/src/app/dev/DevToys.UI/Views/MainWindow.xaml b/src/app/dev/DevToys.UI/Views/MainWindow.xaml
index 9865b6ae4..40a773a56 100644
--- a/src/app/dev/DevToys.UI/Views/MainWindow.xaml
+++ b/src/app/dev/DevToys.UI/Views/MainWindow.xaml
@@ -34,15 +34,14 @@
<VisualState x:Name="CompactOverlay">
<VisualState.Setters>
<!-- TODO -->
- <!--<Setter Target="CompactOverlayButton.Visibility" Value="Collapsed" />
- <Setter Target="NonCompactOverlayButton.Visibility" Value="Visible" />
- <Setter Target="ScrollViewerContent.Margin" Value="12,0,12,0"/>
- <Setter Target="ContentRootScrollViewer.Margin" Value="0,36,0,0"/>
- <Setter Target="ContentFrame.Padding" Value="0,0,0,0"/>
+ <!--
<Setter Target="HeaderTextBlock.Visibility" Value="Collapsed" />
<Setter Target="AppTitleLeftBorder.Width" Value="16" />-->
<Setter Target="NavigationView.AlwaysShowHeader" Value="False" />
<Setter Target="NavigationView.IsPaneVisible" Value="False" />
+ <Setter Target="ContentRootScrollViewer.Margin" Value="0,36,0,0"/>
+ <Setter Target="ScrollViewerContent.Margin" Value="12,0,12,0"/>
+ <Setter Target="ContentFrame.Padding" Value="0,0,0,0"/>
</VisualState.Setters>
</VisualState>
<VisualState x:Name="NavigationViewExpanded">
@@ -51,14 +50,14 @@
</VisualState>
<VisualState x:Name="NavigationViewCompact">
<VisualState.Setters>
- <!--<Setter Target="ScrollViewerContent.Margin" Value="24,48,24,0"/>-->
+ <Setter Target="ScrollViewerContent.Margin" Value="24,48,24,0"/>
</VisualState.Setters>
</VisualState>
<VisualState x:Name="NavigationViewMinimal">
<VisualState.Setters>
- <!--<Setter Target="ContentRootScrollViewer.Margin" Value="0,48,0,0"/>
+ <Setter Target="ContentRootScrollViewer.Margin" Value="0,48,0,0"/>
<Setter Target="ScrollViewerContent.Margin" Value="12,0,12,0"/>
- <Setter Target="ContentFrame.Padding" Value="0,12,0,0"/>-->
+ <Setter Target="ContentFrame.Padding" Value="0,12,0,0"/>
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
@@ -124,6 +123,7 @@
IsPaneToggleButtonVisible="True"
MenuItemsSource="{x:Bind ViewModel.HeaderAndBodyToolViewItems}"
FooterMenuItemsSource="{x:Bind ViewModel.FooterToolViewItems}"
+ SelectedItem="{x:Bind ViewModel.SelectedMenuItem, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
DisplayModeChanged="NavigationView_DisplayModeChanged"
PaneClosing="NavigationView_PaneClosing"
PaneOpening="NavigationView_PaneOpening"
@@ -264,6 +264,34 @@
</dts:MainMenuNavigationViewMenuItemSelector.Separator>
</dts:MainMenuNavigationViewMenuItemSelector>
</NavigationView.MenuItemTemplateSelector>
+
+ <ScrollViewer
+ x:Name="ContentRootScrollViewer"
+ HorizontalScrollMode="Disabled">
+ <Grid
+ Name="ScrollViewerContent"
+ Margin="56,48,56,0">
+ <Grid.Resources>
+ <Style TargetType="FontIcon">
+ <Setter Property="FontFamily" Value="{StaticResource FluentSystemIcons}"/>
+ </Style>
+ </Grid.Resources>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto"/>
+ <RowDefinition Height="*"/>
+ </Grid.RowDefinitions>
+ <TextBlock
+ Name="HeaderTextBlock"
+ Grid.Row="0"
+ Text="{x:Bind ViewModel.HeaderText, Mode=OneWay}"
+ FontSize="24"/>
+ <Frame
+ Grid.Row="1"
+ Name="ContentFrame"
+ Padding="0,12,0,24">
+ </Frame>
+ </Grid>
+ </ScrollViewer>
</NavigationView>
</Grid>
</controls:BackdropPage>