Skip to content

NavigationView: Fix content clipping regression #2717

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
StephenLPeters merged 20 commits into from
Sep 9, 2020
Merged

NavigationView: Fix content clipping regression #2717

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e9ec0f2
restore pre 2.4 content cutoff in closed compact
Felix-Dev Jun 18, 2020
c29e1d3
add interaction test
Felix-Dev Jun 19, 2020
2bef3a7
update comments
Felix-Dev Jun 19, 2020
cb840e1
update visual tree masters
Felix-Dev Jun 20, 2020
d12782f
fix failing tests
Felix-Dev Jun 20, 2020
596764a
disable failing test on RS2
StephenLPeters Jul 21, 2020
4dbc98e
update comment.
StephenLPeters Jul 21, 2020
011a44f
Merge branch 'master' into user/Felix-Dev/navview-contentcutoff-regre…
Felix-Dev Jul 21, 2020
90a145b
Moved execution of CommonTests.MenuItemKeyboardInvokeTest and Selecti…
Felix-Dev Aug 5, 2020
977df04
fix typo
Felix-Dev Aug 5, 2020
fdae62f
fix merge conflict
Felix-Dev Aug 5, 2020
9211fec
Added explanation for given test page restriction.
Felix-Dev Aug 5, 2020
b3b1fb9
fix merge conflicts
Felix-Dev Aug 7, 2020
628da21
Merge branch 'master' into user/Felix-Dev/navview-contentcutoff-regre…
Felix-Dev Aug 11, 2020
6db7a9c
Merge branch 'master' into user/Felix-Dev/navview-contentcutoff-regre…
Felix-Dev Aug 18, 2020
2e2c260
Merge branch 'master' into user/Felix-Dev/navview-contentcutoff-regre…
Felix-Dev Sep 2, 2020
9ee19a6
Fix SettingsCanBeUnselected() interaction test.
Felix-Dev Sep 3, 2020
93f2fd3
Fix merge conflicts.
Felix-Dev Sep 3, 2020
4277e14
Fix failing tests.
Felix-Dev Sep 4, 2020
b2e9c48
Update visual tree verification files.
Felix-Dev Sep 8, 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
40 changes: 39 additions & 1 deletion dev/NavigationView/NavigationView_InteractionTests/CommonTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ public void AddRemoveOriginalItemTest()
Log.Comment("Verify that original menu items can be removed");
removeButton.Invoke();
Wait.ForIdle();
VerifyElement.NotFound("Integer", FindBy.Name);
VerifyElement.NotFound("HasChildItem", FindBy.Name);

Log.Comment("Verify that menu items can be added after removing");
addButton.Invoke();
Expand Down Expand Up @@ -1627,5 +1627,43 @@ public void VerifyExpandCollpaseFunctionality()
}
}
}

[TestMethod]
public void VerifyNavigationViewItemContentPresenterMargin()
{
using (var setup = new TestSetupHelper(new[] { "NavigationView Tests", "NavigationView Test" }))
{
var getTopLevelContentPresenterMarginButton = FindElement.ById<Button>("GetTopLevelNavViewItemContentPresenterMarginButton");
var getChildContentPresenterMarginButton = FindElement.ById<Button>("GetChildNavViewItemContentPresenterMarginButton");
var contentPresenterMarginTextBlock = new TextBlock(FindElement.ByName("NavViewItemContentPresenterMarginTextBlock"));

// Switch the NavigationView to closed compact mode
Log.Comment("Switch NavigationView to closed compact mode");
SetNavViewWidth(ControlWidth.Medium);
Wait.ForIdle();

// Verify that top-level items use the correct content margin
getTopLevelContentPresenterMarginButton.InvokeAndWait();
Verify.AreEqual("0,0,0,0", contentPresenterMarginTextBlock.DocumentText);

// Child items in closed compact mode are shown in a flyout. Verify that they are using the correct margin
Log.Comment("Expand item with children");
UIObject hasChildItem = FindElement.ByName("HasChildItem");
InputHelper.LeftClick(hasChildItem);
Wait.ForIdle();

getChildContentPresenterMarginButton.InvokeAndWait();
Verify.AreEqual("0,0,20,0", contentPresenterMarginTextBlock.DocumentText);

// Switch the NavigationView to expanded mode
Log.Comment("Switch NavigationView to expanded mode");
SetNavViewWidth(ControlWidth.Wide);
Wait.ForIdle();

// Verify that top-level items use the correct content margin
getTopLevelContentPresenterMarginButton.InvokeAndWait();
Verify.AreEqual("0,0,20,0", contentPresenterMarginTextBlock.DocumentText);
}
}
}
}
2 changes: 1 addition & 1 deletion dev/NavigationView/NavigationView_InteractionTests/FocusBehaviorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public void HomeEndNavigationTest()

UIObject firstItem = FindElement.ByName("Home");
UIObject appsItem = FindElement.ByName("Apps");
UIObject lastItem = FindElement.ByName("Integer");
UIObject lastItem = FindElement.ByName("HasChildItem");

Log.Comment("Make sure something inside the ListView other than the first item has input focus");
appsItem.SetFocus();
Expand Down
2 changes: 1 addition & 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 @@ -249,7 +249,7 @@
<Thickness x:Key="NavigationViewCompactItemSeparatorMargin">16,10</Thickness>
<Thickness x:Key="TopNavigationViewItemSeparatorMargin">10,0</Thickness>
<Thickness x:Key="NavigationViewItemContentPresenterMargin">0,0,20,0</Thickness>
<Thickness x:Key="NavigationViewCompactItemContentPresenterMargin">0,0,16,0</Thickness>
<Thickness x:Key="NavigationViewCompactItemContentPresenterMargin">0,0,0,0</Thickness>
<Thickness x:Key="TopNavigationViewItemContentPresenterMargin">8,0,16,0</Thickness>
<Thickness x:Key="NavigationViewItemExpandChevronMargin">-20,0,6,0</Thickness>
<Thickness x:Key="TopNavigationViewItemExpandChevronMargin">-16,0,0,0</Thickness>
Expand Down
15 changes: 15 additions & 0 deletions dev/NavigationView/TestUI/NavigationViewPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@
</muxcontrols:NavigationViewItem.Content>
</muxcontrols:NavigationViewItem>
<muxcontrols:NavigationViewItem x:Name="IntegerItem" AutomationProperties.Name="Integer" Icon="Accept"/>
<muxcontrols:NavigationViewItemSeparator />
<muxcontrols:NavigationViewItem x:Name="HasChildItem" AutomationProperties.Name="HasChildItem" Content="Item with child">
<muxcontrols:NavigationViewItem.MenuItems>
<muxcontrols:NavigationViewItem x:Name="ChildItem" AutomationProperties.Name="ChildItem" Content="Child Item Content" Icon="Document" />
</muxcontrols:NavigationViewItem.MenuItems>
</muxcontrols:NavigationViewItem>
</muxcontrols:NavigationView.MenuItems>

<ScrollViewer Margin="8,0,0,0">
Expand Down Expand Up @@ -267,6 +273,15 @@
</StackPanel>
</StackPanel>

<StackPanel Orientation="Horizontal" Margin="0 5">
<Button x:Name="GetTopLevelNavViewItemContentPresenterMarginButton" AutomationProperties.Name="GetTopLevelNavViewItemContentPresenterMarginButton"
Content="GetTopLevelNavViewItemContentPresenterMargin" Margin="0,0,5,0" Click="GetTopLevelNavViewItemContentPresenterMarginButton_Click"/>
<Button x:Name="GetChildNavViewItemContentPresenterMarginButton" AutomationProperties.Name="GetChildNavViewItemContentPresenterMarginButton"
Content="GetChildNavViewItemContentPresenterMargin" Margin="0,0,2,0" Click="GetChildNavViewItemContentPresenterMarginButton_Click" />
<TextBlock Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">NavViewItemContentPresenter.Margin:</TextBlock>
<TextBlock x:Name="NavViewItemContentPresenterMarginTextBlock" AutomationProperties.Name="NavViewItemContentPresenterMarginTextBlock" VerticalAlignment="Center"/>
</StackPanel>

<TextBlock TextWrapping="Wrap" Grid.Row="1" Margin="5">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris faucibus quam id sem porta posuere. Interdum et malesuada fames ac ante ipsum primis in faucibus. Morbi sodales suscipit justo quis consequat. Vestibulum lectus magna, mattis id eleifend sed, congue eget lectus. Nam et sem pellentesque, dignissim erat eu, tincidunt lacus. Ut porttitor tincidunt ullamcorper. Vestibulum sodales neque purus, vitae eleifend metus convallis in. Etiam non metus nec ligula pharetra molestie. Donec dignissim dapibus blandit. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.

Expand Down
16 changes: 16 additions & 0 deletions dev/NavigationView/TestUI/NavigationViewPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,5 +726,21 @@ private void ReadSettingsSelected_Click(object sender, RoutedEventArgs e)

SettingsSelectedState.Text = (settings as NavigationViewItem).IsSelected.ToString();
}

private void GetTopLevelNavViewItemContentPresenterMarginButton_Click(object sender, RoutedEventArgs e)
{
if (FindVisualChildByName(HomeItem, "ContentPresenter") is ContentPresenter presenter)
{
NavViewItemContentPresenterMarginTextBlock.Text = presenter.Margin.ToString();
}
}

private void GetChildNavViewItemContentPresenterMarginButton_Click(object sender, RoutedEventArgs e)
{
if (FindVisualChildByName(ChildItem, "ContentPresenter") is ContentPresenter presenter)
{
NavViewItemContentPresenterMarginTextBlock.Text = presenter.Margin.ToString();
}
}
}
}
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/master/NavigationViewLeftCompact-5.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=0,0,16,0
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1250,7 +1250,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=0,0,16,0
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/master/NavigationViewLeftCompact-6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=0,0,16,0
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1250,7 +1250,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=0,0,16,0
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/master/NavigationViewLeftCompact-7.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=0,0,16,0
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1273,7 +1273,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=0,0,16,0
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/master/NavigationViewLeftCompact-8.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=0,0,16,0
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1273,7 +1273,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=0,0,16,0
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down
4 changes: 2 additions & 2 deletions test/MUXControlsTestApp/master/NavigationViewLeftCompact.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=0,0,16,0
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down Expand Up @@ -1250,7 +1250,7 @@
BorderBrush=[NULL]
Background=[NULL]
Name=ContentPresenter
Margin=0,0,16,0
Margin=0,0,0,0
FocusVisualSecondaryThickness=1,1,1,1
FocusVisualSecondaryBrush=#99FFFFFF
FocusVisualPrimaryThickness=2,2,2,2
Expand Down