Skip to content

fix: Navigation buttons jumping. #1542

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 2 commits into from
Oct 25, 2025
Merged

fix: Navigation buttons jumping. #1542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33f5a35
Fix navigation buttons jumping.
apachezy Oct 9, 2025
e19dbe2
Merge branch 'main' into fix/nav-buttons-jumping
pomianowski Oct 25, 2025
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
9 changes: 7 additions & 2 deletions src/Wpf.Ui/Controls/NavigationView/NavigationView.Base.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public NavigationView()

private static readonly Thickness TitleBarPaneOpenMarginDefault = new(35, 0, 0, 0);
private static readonly Thickness TitleBarPaneCompactMarginDefault = new(35, 0, 0, 0);
private static readonly Thickness AutoSuggestBoxMarginDefault = new(8, 8, 8, 16);
private static readonly Thickness AutoSuggestBoxMarginDefault = new(8, 0, 8, 0);
private static readonly Thickness FrameMarginDefault = new(0, 50, 0, 0);

protected static void UpdateVisualState(NavigationView navigationView)
Expand Down Expand Up @@ -201,7 +201,12 @@ protected virtual void OnToggleButtonClick(object sender, RoutedEventArgs e)
protected virtual void AutoSuggestBoxSymbolButtonOnClick(object sender, RoutedEventArgs e)
{
SetCurrentValue(IsPaneOpenProperty, !IsPaneOpen);
_ = AutoSuggestBox?.Focus();

// Should not call .Focus() immediately.
_ = Dispatcher.BeginInvoke(
() => AutoSuggestBox?.Focus(),
System.Windows.Threading.DispatcherPriority.Input
);
}

/// <summary>
Expand Down
6 changes: 4 additions & 2 deletions src/Wpf.Ui/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
CornerRadius="{TemplateBinding Border.CornerRadius}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition x:Name="GridColumn1" Width="Auto" />
<ColumnDefinition x:Name="GridColumn2" Width="*" />
</Grid.ColumnDefinitions>

<ContentPresenter
Expand Down Expand Up @@ -70,6 +70,8 @@
</Trigger>
<Trigger Property="Content" Value="{x:Null}">
<Setter TargetName="Icon" Property="Margin" Value="0" />
<Setter TargetName="GridColumn1" Property="Width" Value="*" />
<Setter TargetName="GridColumn2" Property="Width" Value="0" />
</Trigger>
<EventTrigger RoutedEvent="Button.PreviewMouseLeftButtonDown">
<BeginStoryboard>
Expand Down
36 changes: 34 additions & 2 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 @@ -352,7 +352,7 @@
Margin="0,0,0,6"
Icon="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=AutoSuggestBox.Icon}"
Style="{StaticResource BasePaneButtonStyle}"
Visibility="Collapsed" />
Visibility="Hidden" />
</Grid>

<!-- Separator/Shadow for Top -->
Expand Down Expand Up @@ -464,24 +464,56 @@
<VisualStateGroup Name="PaneStates">
<VisualState Name="PaneOpen">
<Storyboard>
<ObjectAnimationUsingKeyFrames
Storyboard.TargetName="AutoSuggestBoxContentPresenter"
Storyboard.TargetProperty="Visibility">
<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
</ObjectAnimationUsingKeyFrames>
<DoubleAnimation
AccelerationRatio="0.4"
Storyboard.TargetName="PaneGrid"
Storyboard.TargetProperty="Width"
From="40"
To="{TemplateBinding OpenPaneLength}"
Duration="0:0:.16" />
<DoubleAnimation
AccelerationRatio="0.4"
Storyboard.TargetName="AutoSuggestBoxContentPresenter"
Storyboard.TargetProperty="Opacity"
From="0"
To="1"
Duration="0:0:.16" />
</Storyboard>
</VisualState>
<VisualState Name="PaneCompact">
<Storyboard>
<DoubleAnimation
AccelerationRatio="0.4"
Storyboard.TargetName="AutoSuggestBoxContentPresenter"
Storyboard.TargetProperty="Opacity"
From="1"
To="0"
Duration="0:0:.16" />
<DoubleAnimation
AccelerationRatio="0.4"
Storyboard.TargetName="PART_AutoSuggestBoxSymbolButton"
Storyboard.TargetProperty="Opacity"
From="0"
To="1"
Duration="0:0:.16" />
<DoubleAnimation
AccelerationRatio="0.4"
Storyboard.TargetName="PaneGrid"
Storyboard.TargetProperty="Width"
From="{TemplateBinding OpenPaneLength}"
To="40"
Duration="0:0:.16" />
<ObjectAnimationUsingKeyFrames
Storyboard.TargetName="AutoSuggestBoxContentPresenter"
Storyboard.TargetProperty="Visibility"
BeginTime="0:0:0.16">
<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
</VisualStateGroup>
Expand All @@ -491,11 +523,11 @@
<ControlTemplate.Triggers>
<Trigger Property="IsPaneOpen" Value="False">
<Setter TargetName="PART_AutoSuggestBoxSymbolButton" Property="Visibility" Value="Visible" />
<Setter TargetName="AutoSuggestBoxContentPresenter" Property="Visibility" Value="Collapsed" />
<Setter TargetName="PART_ToggleButton" Property="Content" Value="{x:Null}" />
</Trigger>
<Trigger Property="AutoSuggestBox" Value="{x:Null}">
<Setter TargetName="PART_AutoSuggestBoxSymbolButton" Property="Visibility" Value="Collapsed" />
<Setter TargetName="AutoSuggestBoxContentPresenter" Property="Visibility" Value="Collapsed" />
</Trigger>
<Trigger Property="PaneTitle" Value="{x:Null}">
<Setter TargetName="PART_ToggleButton" Property="Content" Value="{x:Null}" />
Expand Down
Loading