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

[NavigationView] Fix centering of NVI labels a bit using bottom padding #5187

Merged
merged 10 commits into from
Oct 27, 2023
Merged

[NavigationView] Fix centering of NVI labels a bit using bottom padding #5187

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3133c70
Fix bug by adding bottom padding
marcelwgn Jun 13, 2021
44f5665
Switch to better way
marcelwgn Jun 16, 2021
46bc30f
Update verification files
marcelwgn Jun 24, 2021
2a98b1f
Merge branch 'main' into dev/nvi-text-allign-fix
marcelwgn Jun 24, 2021
5be1b22
Merge branch 'main' into dev/nvi-text-allign-fix
marcelwgn Jul 28, 2021
20a02d7
Merge branch 'main' into dev/nvi-text-allign-fix
ojhad Aug 22, 2023
90370bb
update verification files
karkarl Aug 23, 2023
168daee
update verification files
karkarl Aug 23, 2023
a30bc31
Revert "update verification files"
ojhad Sep 26, 2023
f0e63e6
update visual verification files
ojhad Sep 26, 2023
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_rs1_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,9 @@
<Thickness x:Key="NavigationViewCompactItemSeparatorMargin">0,3,0,4</Thickness>
<Thickness x:Key="TopNavigationViewItemSeparatorMargin">3,0,4,0</Thickness>
<Thickness x:Key="TopNavigationViewOverflowButtonMargin">0</Thickness>
<Thickness x:Key="NavigationViewItemContentPresenterMargin">4,-1,20,-1</Thickness>
<Thickness x:Key="NavigationViewItemContentPresenterMargin">4,-1,20,0</Thickness>
<Thickness x:Key="NavigationViewCompactItemContentPresenterMargin">0,0,0,0</Thickness>
<Thickness x:Key="TopNavigationViewItemContentPresenterMargin">8,-1,12,-1</Thickness>
<Thickness x:Key="TopNavigationViewItemContentPresenterMargin">8,-1,12,0</Thickness>
<Thickness x:Key="TopNavigationViewItemContentOnlyContentPresenterMargin">12,0</Thickness>
<Thickness x:Key="NavigationViewItemExpandChevronMargin">0</Thickness>
<Thickness x:Key="TopNavigationViewItemExpandChevronMargin">-16,0,0,0</Thickness>
Expand Down
4 changes: 2 additions & 2 deletions dev/NavigationView/NavigationView_rs1_themeresources_v1.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,9 @@
<Thickness x:Key="NavigationViewCompactItemSeparatorMargin">16,10</Thickness>
<Thickness x:Key="TopNavigationViewItemSeparatorMargin">10,0</Thickness>
<Thickness x:Key="TopNavigationViewOverflowButtonMargin">0</Thickness>
<Thickness x:Key="NavigationViewItemContentPresenterMargin">0,0,20,0</Thickness>
<Thickness x:Key="NavigationViewItemContentPresenterMargin">0,-1,20,0</Thickness>
<Thickness x:Key="NavigationViewCompactItemContentPresenterMargin">0,0,0,0</Thickness>
<Thickness x:Key="TopNavigationViewItemContentPresenterMargin">8,0,16,0</Thickness>
<Thickness x:Key="TopNavigationViewItemContentPresenterMargin">8,-1,16,0</Thickness>
<Thickness x:Key="TopNavigationViewItemContentOnlyContentPresenterMargin">12,0</Thickness>
<Thickness x:Key="NavigationViewItemExpandChevronMargin">-20,0,6,0</Thickness>
<Thickness x:Key="TopNavigationViewItemExpandChevronMargin">-16,0,0,0</Thickness>
Expand Down
6 changes: 3 additions & 3 deletions test/MUXControlsTestApp/verification/NavigationViewAuto-4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1372,7 +1372,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -2263,7 +2263,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down
6 changes: 3 additions & 3 deletions test/MUXControlsTestApp/verification/NavigationViewAuto-7.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1321,7 +1321,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -2197,7 +2197,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down
6 changes: 3 additions & 3 deletions test/MUXControlsTestApp/verification/NavigationViewAuto-8.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1321,7 +1321,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -2197,7 +2197,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down
6 changes: 3 additions & 3 deletions test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,7 +1074,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1331,7 +1331,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1822,7 +1822,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down
6 changes: 3 additions & 3 deletions test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-7.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1320,7 +1320,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1786,7 +1786,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down
6 changes: 3 additions & 3 deletions test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-8.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1321,7 +1321,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1787,7 +1787,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down
6 changes: 3 additions & 3 deletions test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1412,7 +1412,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1669,7 +1669,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -2198,7 +2198,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down
6 changes: 3 additions & 3 deletions test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-7.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1392,7 +1392,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1651,7 +1651,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -2156,7 +2156,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down
6 changes: 3 additions & 3 deletions test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-8.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1392,7 +1392,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1651,7 +1651,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -2156,7 +2156,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=4,-1,20,-1
Margin=4,-1,20,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#B3FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down
Loading