Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Fixes 7913 Add UWP shell flyout scroll mode support #12547

Merged
merged 1 commit into from
Nov 6, 2020
Merged

Fixes 7913 Add UWP shell flyout scroll mode support #12547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 29 additions & 0 deletions Xamarin.Forms.Platform.UAP/Shell/ShellRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ void OnPaneOpening(Microsoft.UI.Xaml.Controls.NavigationView sender, object args
UpdatePaneButtonColor(NavigationViewBackButton, false);
UpdateFlyoutBackgroundColor();
UpdateFlyoutBackdrop();
UpdateFlyoutVerticalScrollMode();
}

void OnPaneOpened(Microsoft.UI.Xaml.Controls.NavigationView sender, object args)
Expand Down Expand Up @@ -187,6 +188,7 @@ public void SetElement(VisualElement element)

#endregion IVisualElementRenderer
ShellSplitView ShellSplitView => (ShellSplitView)GetTemplateChild("RootSplitView");
ScrollViewer ShellLeftNavScrollViewer => (ScrollViewer)GetTemplateChild("LeftNavScrollViewer");
protected internal Shell Element { get; set; }

internal Shell Shell => Element;
Expand All @@ -210,6 +212,33 @@ protected virtual void OnElementPropertyChanged(object sender, PropertyChangedEv
{
UpdateFlyoutBackgroundColor();
}
else if (e.PropertyName == Shell.FlyoutVerticalScrollModeProperty.PropertyName)
{
UpdateFlyoutVerticalScrollMode();
}
}

void UpdateFlyoutVerticalScrollMode()
{
var scrollViewer = ShellLeftNavScrollViewer;
if (scrollViewer != null)
{
switch (Shell.FlyoutVerticalScrollMode)
{
case ScrollMode.Disabled:
scrollViewer.VerticalScrollMode = Windows.UI.Xaml.Controls.ScrollMode.Disabled;
scrollViewer.VerticalScrollBarVisibility = Windows.UI.Xaml.Controls.ScrollBarVisibility.Hidden;
break;
case ScrollMode.Enabled:
scrollViewer.VerticalScrollMode = Windows.UI.Xaml.Controls.ScrollMode.Enabled;
scrollViewer.VerticalScrollBarVisibility = Windows.UI.Xaml.Controls.ScrollBarVisibility.Visible;
break;
default:
scrollViewer.VerticalScrollMode = Windows.UI.Xaml.Controls.ScrollMode.Auto;
scrollViewer.VerticalScrollBarVisibility = Windows.UI.Xaml.Controls.ScrollBarVisibility.Auto;
break;
}
}
}

void UpdateFlyoutBackdrop()
Expand Down
1 change: 1 addition & 0 deletions Xamarin.Forms.Platform.UAP/Shell/ShellStyles.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,7 @@
HorizontalAlignment="Stretch"
VerticalAlignment="Top">
<ScrollViewer
x:Name="LeftNavScrollViewer"
TabNavigation="Once"
VerticalScrollBarVisibility="Auto">
<winui:ItemsRepeater
Expand Down