tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix Safe Area calc in drawer page (#21050) 

* fix safe area calc in drawer page

* pagenavigationhost - properly clean up scaling change subscription

---------

Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
release/latest
Emmanuel Hansen 6 months ago
committed by Julien Lebosquain
parent
475d364fd4
commit
90eeb51abb
2 changed files with 55 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 59
      src/Avalonia.Controls/Page/DrawerPage.cs
  2. 12
      src/Avalonia.Controls/Page/PageNavigationHost.cs

59
src/Avalonia.Controls/Page/DrawerPage.cs
View File

@ -231,6 +231,7 @@ namespace Avalonia.Controls
private const double EdgeGestureWidth = 20; private const double EdgeGestureWidth = 20;
private bool _suppressDrawerEvents; private bool _suppressDrawerEvents;
private bool _hasHadFirstPage; private bool _hasHadFirstPage;
private bool _hideTopBar;
private readonly SwipeGestureRecognizer _swipeRecognizer = new SwipeGestureRecognizer(); private readonly SwipeGestureRecognizer _swipeRecognizer = new SwipeGestureRecognizer();
private bool IsRtl => FlowDirection == FlowDirection.RightToLeft; private bool IsRtl => FlowDirection == FlowDirection.RightToLeft;
@ -865,17 +866,39 @@ namespace Avalonia.Controls
{ {
if (_contentPresenter != null && _drawerPresenter != null) if (_contentPresenter != null && _drawerPresenter != null)
{ {
var hasDrawerHeader = DrawerHeader != null;
var hasDrawerFooter = DrawerFooter != null;
if (IsVerticalPlacement) if (IsVerticalPlacement)
{ {
_drawerPresenter.Padding = DrawerPlacement == DrawerPlacement.Bottom _drawerPresenter.Padding = DrawerPlacement == DrawerPlacement.Top
? new Thickness(SafeAreaPadding.Left, SafeAreaPadding.Top, SafeAreaPadding.Right, 0) ? new Thickness(SafeAreaPadding.Left, hasDrawerHeader ? 0 : SafeAreaPadding.Top, SafeAreaPadding.Right, 0)
: new Thickness(SafeAreaPadding.Left, 0, SafeAreaPadding.Right, SafeAreaPadding.Bottom); : new Thickness(SafeAreaPadding.Left, 0, SafeAreaPadding.Right, hasDrawerFooter ? 0 : SafeAreaPadding.Bottom);
if (_drawerHeaderPresenter != null && hasDrawerHeader)
_drawerHeaderPresenter.Padding = DrawerPlacement == DrawerPlacement.Bottom
? new Thickness(SafeAreaPadding.Left, 0, SafeAreaPadding.Right, 0)
: new Thickness(SafeAreaPadding.Left, SafeAreaPadding.Top, SafeAreaPadding.Right, 0);
if (_drawerFooterPresenter != null && hasDrawerFooter)
_drawerFooterPresenter.Padding = DrawerPlacement == DrawerPlacement.Bottom
? new Thickness(SafeAreaPadding.Left, 0, SafeAreaPadding.Right, SafeAreaPadding.Bottom)
: new Thickness(SafeAreaPadding.Left, 0, SafeAreaPadding.Right, 0);
} }
else else
{ {
_drawerPresenter.Padding = IsPaneOnRight _drawerPresenter.Padding = IsPaneOnRight
? new Thickness(0, SafeAreaPadding.Top, SafeAreaPadding.Right, SafeAreaPadding.Bottom) ? new Thickness(0, hasDrawerHeader ? 0 : SafeAreaPadding.Top, SafeAreaPadding.Right, hasDrawerFooter ? 0 : SafeAreaPadding.Bottom)
: new Thickness(SafeAreaPadding.Left, SafeAreaPadding.Top, 0, SafeAreaPadding.Bottom); : new Thickness(SafeAreaPadding.Left, hasDrawerHeader ? 0 : SafeAreaPadding.Top, 0, hasDrawerFooter ? 0 : SafeAreaPadding.Bottom);
if (_drawerHeaderPresenter != null && hasDrawerHeader)
_drawerHeaderPresenter.Padding = IsPaneOnRight
? new Thickness(0, SafeAreaPadding.Top, SafeAreaPadding.Right, 0)
: new Thickness(SafeAreaPadding.Left, SafeAreaPadding.Top, 0, 0);
if (_drawerFooterPresenter != null && hasDrawerFooter)
_drawerFooterPresenter.Padding = IsPaneOnRight ?
new Thickness(0, 0, SafeAreaPadding.Right, SafeAreaPadding.Bottom)
: new Thickness(SafeAreaPadding.Left, 0, 0, SafeAreaPadding.Bottom);
} }
if (_topBar != null) if (_topBar != null)
@ -888,7 +911,7 @@ namespace Avalonia.Controls
if (Content is Page detail) if (Content is Page detail)
{ {
var remainingSafeArea = Padding.GetRemainingSafeAreaPadding(SafeAreaPadding); var remainingSafeArea = Padding.GetRemainingSafeAreaPadding(SafeAreaPadding);
detail.SafeAreaPadding = new Thickness(remainingSafeArea.Left, 0, remainingSafeArea.Right, remainingSafeArea.Bottom); detail.SafeAreaPadding = new Thickness(remainingSafeArea.Left, _hideTopBar ? remainingSafeArea.Top : 0, remainingSafeArea.Right, remainingSafeArea.Bottom);
} }
} }
} }
@ -925,14 +948,14 @@ namespace Avalonia.Controls
_splitView.PanePlacement = DrawerPlacement switch _splitView.PanePlacement = DrawerPlacement switch
{ {
DrawerPlacement.Right => SplitViewPanePlacement.Right, DrawerPlacement.Right => SplitViewPanePlacement.Right,
DrawerPlacement.Top => SplitViewPanePlacement.Top, DrawerPlacement.Top => SplitViewPanePlacement.Top,
DrawerPlacement.Bottom => SplitViewPanePlacement.Bottom, DrawerPlacement.Bottom => SplitViewPanePlacement.Bottom,
_ => SplitViewPanePlacement.Left _ => SplitViewPanePlacement.Left
}; };
PseudoClasses.Set(":placement-right", DrawerPlacement == DrawerPlacement.Right); PseudoClasses.Set(":placement-right", DrawerPlacement == DrawerPlacement.Right);
PseudoClasses.Set(":placement-top", DrawerPlacement == DrawerPlacement.Top); PseudoClasses.Set(":placement-top", DrawerPlacement == DrawerPlacement.Top);
PseudoClasses.Set(":placement-bottom", DrawerPlacement == DrawerPlacement.Bottom); PseudoClasses.Set(":placement-bottom", DrawerPlacement == DrawerPlacement.Bottom);
} }
@ -963,13 +986,19 @@ namespace Avalonia.Controls
if (mode == SplitViewDisplayMode.Inline) if (mode == SplitViewDisplayMode.Inline)
{ {
_suppressDrawerEvents = true; _suppressDrawerEvents = true;
try { SetCurrentValue(IsOpenProperty, true); } try
{
SetCurrentValue(IsOpenProperty, true);
}
finally { _suppressDrawerEvents = false; } finally { _suppressDrawerEvents = false; }
} }
else if (mode == SplitViewDisplayMode.Overlay) else if (mode == SplitViewDisplayMode.Overlay)
{ {
_suppressDrawerEvents = true; _suppressDrawerEvents = true;
try { SetCurrentValue(IsOpenProperty, false); } try
{
SetCurrentValue(IsOpenProperty, false);
}
finally { _suppressDrawerEvents = false; } finally { _suppressDrawerEvents = false; }
} }
} }
@ -1064,8 +1093,8 @@ namespace Avalonia.Controls
private void UpdateDetailNavBarVisiblePseudoClass() private void UpdateDetailNavBarVisiblePseudoClass()
{ {
bool hideTopBar = Content is NavigationPage navPage && navPage.IsNavBarEffectivelyVisible; _hideTopBar = Content is NavigationPage navPage && navPage.IsNavBarEffectivelyVisible;
PseudoClasses.Set(":detail-is-navpage", hideTopBar); PseudoClasses.Set(":detail-is-navpage", _hideTopBar);
} }
protected override AutomationPeer OnCreateAutomationPeer() => new DrawerPageAutomationPeer(this); protected override AutomationPeer OnCreateAutomationPeer() => new DrawerPageAutomationPeer(this);

12
src/Avalonia.Controls/Page/PageNavigationHost.cs
View File

@ -1,7 +1,6 @@
using Avalonia.Controls.Platform; using Avalonia.Controls.Platform;
using Avalonia.Controls.Presenters; using Avalonia.Controls.Presenters;
using Avalonia.Controls.Primitives; using Avalonia.Controls.Primitives;
using Avalonia.Controls.Templates;
using Avalonia.Interactivity; using Avalonia.Interactivity;
namespace Avalonia.Controls namespace Avalonia.Controls
@ -27,6 +26,7 @@ namespace Avalonia.Controls
static PageNavigationHost() static PageNavigationHost()
{ {
ContentTemplateProperty.OverrideDefaultValue<PageNavigationHost>(new DefaultPageDataTemplate()); ContentTemplateProperty.OverrideDefaultValue<PageNavigationHost>(new DefaultPageDataTemplate());
TopLevel.AutoSafeAreaPaddingProperty.OverrideDefaultValue<PageNavigationHost>(false);
} }
/// <summary> /// <summary>
@ -54,11 +54,20 @@ namespace Avalonia.Controls
} }
if (_topLevel != null) if (_topLevel != null)
{
_topLevel.BackRequested += TopLevel_BackRequested; _topLevel.BackRequested += TopLevel_BackRequested;
_topLevel.ScalingChanged += TopLevel_ScalingChanged;
}
AttachContentPresenter(); AttachContentPresenter();
} }
private void TopLevel_ScalingChanged(object? sender, System.EventArgs e)
{
if (_insetManager != null && _contentPresenter?.Child is Page page)
page.SafeAreaPadding = _insetManager.SafeAreaPadding;
}
protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e) protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
{ {
base.OnDetachedFromVisualTree(e); base.OnDetachedFromVisualTree(e);
@ -80,6 +89,7 @@ namespace Avalonia.Controls
if (_topLevel != null) if (_topLevel != null)
{ {
_topLevel.BackRequested -= TopLevel_BackRequested; _topLevel.BackRequested -= TopLevel_BackRequested;
_topLevel.ScalingChanged -= TopLevel_ScalingChanged;
_topLevel = null; _topLevel = null;
} }
} }

Write Preview
Loading…
Cancel
Save