Skip to content

Main fix navigation view 1002 #1003

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

Closed
wants to merge 5 commits into from
Closed

Main fix navigation view 1002 #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c32c95
fix Navigation view selected item bug
SergeyNefyodov Mar 16, 2024
21c67fb
Merge branch 'development' into main-fix-navigation-view-1002
pomianowski Mar 18, 2024
484c7d7
Merge branch 'development' into main-fix-navigation-view-1002
pomianowski Mar 19, 2024
7bbc304
Merge branch 'development' into main-fix-navigation-view-1002
pomianowski Mar 19, 2024
578381a
Merge branch 'development' into main-fix-navigation-view-1002
pomianowski Apr 14, 2024
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
10 changes: 10 additions & 0 deletions src/Wpf.Ui/Controls/NavigationView/NavigationViewBottom.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,16 @@
<Setter TargetName="IconContentPresenter" Property="Margin" Value="0" />
<Setter TargetName="ElementContentPresenter" Property="Visibility" Value="Collapsed" />
</Trigger>
<Trigger Property="IsActive" Value="True">
<Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0" />
<Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelected}" />
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPointerOver}" />
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPressed}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</ResourceDictionary>
18 changes: 14 additions & 4 deletions src/Wpf.Ui/Controls/NavigationView/NavigationViewTop.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type controls:NavigationViewItem}">
<Border
x:Name="MainBorder"
x:Name="SubMenuMainBorder"
Height="25"
Margin="0"
Padding="0"
Expand Down Expand Up @@ -285,13 +285,13 @@
<ControlTemplate.Triggers>
<Trigger Property="IsActive" Value="True">
<Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0" />
<Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelected}" />
<Setter TargetName="SubMenuMainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelected}" />
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPointerOver}" />
<Setter TargetName="SubMenuMainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPointerOver}" />
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPressed}" />
<Setter TargetName="SubMenuMainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPressed}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
Expand Down Expand Up @@ -361,6 +361,16 @@
<Setter TargetName="IconContentPresenter" Property="Margin" Value="0" />
<Setter TargetName="ElementContentPresenter" Property="Visibility" Value="Collapsed" />
</Trigger>
<Trigger Property="IsActive" Value="True">
<Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0" />
<Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelected}" />
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPointerOver}" />
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundPressed}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>

Expand Down
Loading