A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Improved layout of NavigationView in Blazor
Etienne Baudoux0e75f44eaad7
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Grid/Grid.razor b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Grid/Grid.razorindex fe7f0685f..085e84146 100644--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Grid/Grid.razor+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Grid/Grid.razor@@ -1,10 +1,12 @@@namespace DevToys.MauiBlazor.Components+@inherits FluentComponentBase+<CascadingValue Value="this">@ColumnDefinitions@RowDefinitions- <div style="@_wrapper.Css @_wrapper.RowGap(RowGap) @_wrapper.ColumnGap(ColumnGap)">+ <div style="@_wrapper.Css @_wrapper.RowGap(RowGap) @_wrapper.ColumnGap(ColumnGap) @Style">@Content</div></CascadingValue>diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/NavigationView.razor b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/NavigationView.razorindex c4d35add5..c46f1ac98 100644--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/NavigationView.razor+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/NavigationView.razor@@ -1,38 +1,55 @@-@inherits FluentComponentBase+@using DevToys.Localization.Strings.MainWindow;++@inherits FluentComponentBase<CascadingValue Value="this" IsFixed=false Name="NavigationView"><Grid><RowDefinitions>- <RowDefinition Height="Auto" />- <RowDefinition Height="*" />- <RowDefinition Height="Auto" />+ <RowDefinition Height="Auto" /> @* Back Button *@+ <RowDefinition Height="Auto" /> @* Hamburger Menu, Search Bar & Content *@+ <RowDefinition Height="*" /> @* Top Menu *@+ <RowDefinition Height="Auto" /> @* Bottom Menu *@</RowDefinitions><ColumnDefinitions>- <ColumnDefinition Width="320" />- <ColumnDefinition Width="*" />+ <ColumnDefinition Width="320" /> @* Side bar *@+ <ColumnDefinition Width="*" /> @* Content *@</ColumnDefinitions><Content>- @* Search Bar *@- <GridElement Row="1" Column="1" HorizontalAlignment="@Alignment.Stretch" VerticalAlignment="@Alignment.Start">- <FluentSearch Placeholder="Type to search for tools..." Style="margin-left: 22px; margin-right: 22px" />+ @* Back Button *@+ <GridElement Row="1" Column="1" VerticalAlignment="@Alignment.Start">+ <StackPanel Orientation="@Orientation.Horizontal" HorizontalAlignment="StackHorizontalAlignment.Left" Style="padding: 4px 4px 0px 4px;">+ <FluentButton Style="width: 40px; height: 36px">+ <FluentIcon Name="@FluentIcons.ArrowLeft" Size="@IconSize.Size16" Color="Color.Neutral" />+ </FluentButton>+ </StackPanel>+ </GridElement>++ @* Hamburger Menu & Search Bar *@+ <GridElement Row="2" Column="1" VerticalAlignment="@Alignment.Start">+ <StackPanel Orientation="@Orientation.Vertical" Style="padding: 4px 4px 0px 4px;">+ <FluentButton Style="width: 40px; height: 36px">+ <FluentIcon Name="@FluentIcons.Navigation" Size="@IconSize.Size16" Color="Color.Neutral" />+ </FluentButton>+ <FluentSearch Placeholder="@MainWindow.Search" Style="margin-top: 2px; margin-bottom: 8px; margin-left: 12px; margin-right: 12px; width: -webkit-fill-available;" />+ </StackPanel></GridElement>@* Top Menu *@- <GridElement Row="2" Column="1" HorizontalAlignment="@Alignment.Stretch" VerticalAlignment="@Alignment.Start">- <StackPanel Orientation="@Orientation.Vertical">+ <GridElement Row="3" Column="1" VerticalAlignment="@Alignment.Start">+ <StackPanel Orientation="@Orientation.Vertical" Style="padding: 4px 4px 0px 4px;">@MenuItemsSource</StackPanel></GridElement>@* Bottom Menu *@- <GridElement Row="3" Column="1" HorizontalAlignment="@Alignment.Stretch" VerticalAlignment="@Alignment.End">- <StackPanel Orientation="@Orientation.Vertical">+ <GridElement Row="4" Column="1" VerticalAlignment="@Alignment.End">+ <StackPanel Orientation="@Orientation.Vertical" Style="padding: 4px 4px 4px 4px;">@FooterMenuItemsSource</StackPanel></GridElement>@* Content of the Navigation View *@- <GridElement Row="1" RowSpan="3" Column="2" HorizontalAlignment="@Alignment.Stretch" VerticalAlignment="@Alignment.Stretch">+ <GridElement Row="2" RowSpan="4" Column="2" HorizontalAlignment="@Alignment.Stretch" VerticalAlignment="@Alignment.Stretch">@Content</GridElement></Content>diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/StackPanel.razor.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/StackPanel.razor.csindex 79e35aa85..955e92ab3 100644--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/StackPanel.razor.cs+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/StackPanel.razor.cs@@ -103,13 +103,13 @@ public partial class StackPanel : FluentComponentBase/// Gets or sets the gap between horizontally stacked components (in pixels)./// </summary>[Parameter]- public int? HorizontalGap { get; set; } = 10;+ public int? HorizontalGap { get; set; } = 4;/// <summary>/// Gets or sets the gap between vertically stacked components (in pixels)./// </summary>[Parameter]- public int? VerticalGap { get; set; } = 10;+ public int? VerticalGap { get; set; } = 4;/// <summary>/// Gets or sets the content to be rendered inside the component.diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor.css b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor.cssindex 166f70e8e..7b8fc5759 100644--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor.css+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Shared/MainLayout.razor.css@@ -2,7 +2,6 @@width: 100%;height: 100%;position: fixed;- padding-top: 30px;top: 0;left: 0;background-color: var(--neutral-layer-3);