Skip to content

Revert "🐛 pin footer menu items to prevent scrolling" #1435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pomianowski merged 1 commit into from
May 26, 2025
Merged

Revert "🐛 pin footer menu items to prevent scrolling" #1435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 45 additions & 64 deletions src/Wpf.Ui/Controls/NavigationView/NavigationViewCompact.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,14 +288,12 @@
<Border x:Name="PaneBorder">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<!-- Pane Header (Fixed) -->
<!-- Back and Toggle buttons -->
<Grid Grid.Row="0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
Expand Down Expand Up @@ -333,7 +331,7 @@
</controls:Button.Content>
</controls:Button>

<!-- Pane Header -->
<!-- Pane header -->
<ContentPresenter
Grid.Row="2"
Margin="0"
Expand All @@ -343,7 +341,7 @@
<ContentPresenter
x:Name="AutoSuggestBoxContentPresenter"
Grid.Row="3"
Margin="0,0,0,6"
Margin="0"
Content="{TemplateBinding AutoSuggestBox}" />

<controls:Button
Expand All @@ -355,74 +353,57 @@
Visibility="Collapsed" />
</Grid>

<!-- Separator/Shadow for Top -->
<Border
Grid.Row="1"
Height="1"
Margin="0,4,0,4"
Background="{DynamicResource LeftNavigationViewSeparatorBrush}" />

<!-- Scrollable Menu Items -->
<!-- Menu items -->
<controls:DynamicScrollViewer
x:Name="PART_ScrollViewer"
Grid.Row="2"
Grid.Row="1"
Margin="0,0,-4,0"
Padding="0,0,4,0"
CanContentScroll="True"
HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto">
<ItemsControl
x:Name="PART_MenuItemsItemsControl"
Focusable="False"
KeyboardNavigation.DirectionalNavigation="Contained"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Disabled">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Margin="0" IsItemsHost="True" />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
</ItemsControl>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<ItemsControl
x:Name="PART_MenuItemsItemsControl"
Grid.Row="0"
Focusable="False"
KeyboardNavigation.DirectionalNavigation="Contained"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Disabled">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Margin="0" IsItemsHost="True" />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
</ItemsControl>
<ItemsControl
x:Name="PART_FooterMenuItemsItemsControl"
Grid.Row="1"
Margin="0,0,0,4"
Focusable="False"
KeyboardNavigation.DirectionalNavigation="Contained"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Disabled">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Margin="0" IsItemsHost="True" />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
</ItemsControl>
</Grid>
</controls:DynamicScrollViewer>

<!-- Separator/Shadow for Footer -->
<Border
Grid.Row="3"
Height="1"
Margin="0,4,0,4"
Background="{DynamicResource LeftNavigationViewSeparatorBrush}" />

<!-- Footer (Fixed) -->
<Grid Grid.Row="4">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<ItemsControl
x:Name="PART_FooterMenuItemsItemsControl"
Grid.Row="0"
Margin="0,0,0,4"
Focusable="False"
KeyboardNavigation.DirectionalNavigation="Contained"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Disabled">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Margin="0" IsItemsHost="True" />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
</ItemsControl>

<ContentPresenter
Grid.Row="1"
Margin="0"
Content="{TemplateBinding PaneFooter}" />
</Grid>
<!-- Pane footer -->
<ContentPresenter
Grid.Row="2"
Margin="0"
Content="{TemplateBinding PaneFooter}" />
</Grid>
</Border>
</Grid>

<Border
Grid.Column="1"
Margin="{TemplateBinding FrameMargin}"
Expand All @@ -436,7 +417,7 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>

<!-- Header (e.g., BreadcrumbBar) -->
<!-- Header -->
<ContentPresenter
Grid.Row="0"
Margin="0"
Expand All @@ -451,7 +432,7 @@
Transition="{TemplateBinding Transition}"
TransitionDuration="{TemplateBinding TransitionDuration}" />

<!-- Overlay (e.g., SnackbarPresenter) -->
<!-- Overlay -->
<ContentPresenter
Grid.Row="0"
Grid.RowSpan="2"
Expand Down
8 changes: 0 additions & 8 deletions src/Wpf.Ui/Resources/Theme/Dark.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,12 +681,4 @@
<SolidColorBrush x:Key="TreeViewItemBackgroundSelected" Color="{StaticResource SubtleFillColorSecondary}" />
<SolidColorBrush x:Key="TreeViewItemForeground" Color="{StaticResource TextFillColorPrimary}" />
<SolidColorBrush x:Key="TreeViewItemSelectionIndicatorForeground" Color="{DynamicResource SystemAccentColorPrimary}" />

<!-- LeftNavigationViewTemplate -->
<LinearGradientBrush x:Key="LeftNavigationViewSeparatorBrush" StartPoint="0,0" EndPoint="1,0">
<GradientStop Offset="0" Color="Transparent" />
<GradientStop Offset="0.3" Color="#555555" />
<GradientStop Offset="0.7" Color="#555555" />
<GradientStop Offset="1" Color="Transparent" />
</LinearGradientBrush>
</ResourceDictionary>
8 changes: 0 additions & 8 deletions src/Wpf.Ui/Resources/Theme/Light.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,12 +682,4 @@
<SolidColorBrush x:Key="TreeViewItemBackgroundSelected" Color="{StaticResource SubtleFillColorSecondary}" />
<SolidColorBrush x:Key="TreeViewItemForeground" Color="{StaticResource TextFillColorPrimary}" />
<SolidColorBrush x:Key="TreeViewItemSelectionIndicatorForeground" Color="{DynamicResource SystemAccentColorPrimary}" />

<!-- LeftNavigationViewTemplate -->
<LinearGradientBrush x:Key="LeftNavigationViewSeparatorBrush" StartPoint="0,0" EndPoint="1,0">
<GradientStop Offset="0" Color="#F5F5F5" />
<GradientStop Offset="0.3" Color="#E0E0E0" />
<GradientStop Offset="0.7" Color="#E0E0E0" />
<GradientStop Offset="1" Color="#FAFAFA" />
</LinearGradientBrush>
</ResourceDictionary>
Loading