Skip to content
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

Add resource for topmode CustomContentPane minimum width #2905

Merged
merged 4 commits into from
Jul 31, 2020
Merged

Add resource for topmode CustomContentPane minimum width #2905

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c15df4
Add resource for topmode CustomContentPane minimum width
marcelwgn Jul 14, 2020
c416460
Update name
marcelwgn Jul 14, 2020
1efe5c9
Fix missed renaming
marcelwgn Jul 17, 2020
5c8c435
Reverted wrong setter
marcelwgn Jul 21, 2020
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
4 changes: 2 additions & 2 deletions dev/NavigationView/NavigationView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<VisualState x:Name="OverflowButtonWithLabel" />
<VisualState x:Name="OverflowButtonNoLabel">
<VisualState.Setters>
<Setter Target="TopNavOverflowButton.Style" Value="{ThemeResource NavigationViewOverflowButtonNoLabelStyleWhenPaneOnTop}" />
<Setter Target="TopNavOverflowButton.Style" Value="{ThemeResource TopNavigationViewPaneCustomContentMinWidth}" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TopNavigationViewPaneCustomContentMinWidth [](start = 106, length = 42)

Am i missing something here or is this change setting a style to a double?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure how that slipped in, should be fixed now.

</VisualState.Setters>
</VisualState>
</VisualStateGroup>
Expand Down Expand Up @@ -233,7 +233,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*" MinWidth="48"/>
<ColumnDefinition Width="*" MinWidth="{ThemeResource NavigationViewTopModeContentPaneMinWidth}"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
Expand Down
3 changes: 2 additions & 1 deletion dev/NavigationView/NavigationView_rs1_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,8 @@
<x:Double x:Key="PaneToggleButtonWidth">40</x:Double>
<x:Double x:Key="NavigationViewCompactPaneLength">40</x:Double>
<x:Double x:Key="NavigationViewTopPaneHeight">40</x:Double>

<x:Double x:Key="TopNavigationViewPaneCustomContentMinWidth">48</x:Double>

<x:Double x:Key="NavigationViewItemOnLeftMinHeight">40</x:Double>
<x:Double x:Key="NavigationViewPaneHeaderRowMinHeight">4</x:Double>

Expand Down