Skip to content

fix: Rename DrawerControl resource keys that shadow WinUI NavigationView theme resources #1553

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

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix: Rename DrawerControl resource keys that shadow WinUI NavigationView theme resources #1553

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b7f1ba
Initial plan
Copilot Mar 16, 2026
ccffa02
fix: rename conflicting NavigationView resource keys in DrawerControl
Copilot Mar 16, 2026
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: 5 additions & 5 deletions src/Uno.Toolkit.UI/Controls/DrawerControl/DrawerControl.Enhanced.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
xmlns:todo="what should be done"
mc:Ignorable="todo xamarin">

<x:Double x:Key="PaneToggleButtonHeight">40</x:Double>
<x:Double x:Key="NavigationViewPaneHeaderRowMinHeight">4</x:Double>
<x:Double x:Key="DrawerPaneToggleButtonHeight">40</x:Double>
<x:Double x:Key="DrawerNavigationViewPaneHeaderRowMinHeight">4</x:Double>
<StaticResource x:Key="DrawerControlDrawerBackgroundBrush"
ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
<SolidColorBrush x:Key="SplitViewDrawerLightDismissOverlayBackgroundBrush"
Expand Down Expand Up @@ -168,7 +168,7 @@
<!-- above button margin + back button space -->
<RowDefinition x:Name="PaneContentGridToggleButtonRow"
Height="Auto"
MinHeight="{StaticResource NavigationViewPaneHeaderRowMinHeight}" />
MinHeight="{StaticResource DrawerNavigationViewPaneHeaderRowMinHeight}" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="8" />
Expand All @@ -182,7 +182,7 @@

<Grid Grid.Row="2"
x:Name="PaneHeaderContentBorderWrapper"
MinHeight="{StaticResource NavigationViewPaneHeaderRowMinHeight}">
MinHeight="{StaticResource DrawerNavigationViewPaneHeaderRowMinHeight}">
<!-- TODO: Uno specific: MinHeight and x:Name used here as RowDefinifiont.MinHeight does not work (issue #4727) -->
<Grid.RowDefinitions>
<RowDefinition x:Name="PaneHeaderContentBorderRow" />
Expand Down Expand Up @@ -307,7 +307,7 @@
<ContentControl x:Name="HeaderContent"
Grid.Row="1"
Grid.Column="1"
MinHeight="{StaticResource PaneToggleButtonHeight}"
MinHeight="{StaticResource DrawerPaneToggleButtonHeight}"
IsTabStop="False"
Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
Expand Down