|
10 | 10 | using Windows.UI.Xaml.Controls; |
11 | 11 | using Windows.UI.Xaml.Input; |
12 | 12 | using Windows.UI.Xaml.Navigation; |
| 13 | +using NavigationView = Microsoft.UI.Xaml.Controls; |
13 | 14 |
|
14 | 15 | namespace Microsoft.Toolkit.Uwp.UI.Controls |
15 | 16 | { |
@@ -42,12 +43,12 @@ public partial class ListDetailsView : ItemsControl |
42 | 43 | private AppViewBackButtonVisibility? _previousSystemBackButtonVisibility; |
43 | 44 | private bool _previousNavigationViewBackEnabled; |
44 | 45 |
|
45 | | - // Int used because the underlying type is an enum, but we don't have access to the enum |
46 | | - private int _previousNavigationViewBackVisibilty; |
| 46 | + private NavigationView.NavigationViewBackButtonVisible _previousNavigationViewBackVisibilty; |
| 47 | + private NavigationView.NavigationView _navigationView; |
| 48 | + |
47 | 49 | private ContentPresenter _detailsPresenter; |
48 | 50 | private VisualStateGroup _selectionStateGroup; |
49 | 51 | private Button _inlineBackButton; |
50 | | - private Microsoft.UI.Xaml.Controls.NavigationView _navigationView; |
51 | 52 | private Frame _frame; |
52 | 53 |
|
53 | 54 | /// <summary> |
@@ -199,7 +200,7 @@ private void OnLoaded(object sender, RoutedEventArgs e) |
199 | 200 | _frame.Navigating -= OnFrameNavigating; |
200 | 201 | } |
201 | 202 |
|
202 | | - _navigationView = this.FindAscendant<Microsoft.UI.Xaml.Controls.NavigationView>(); |
| 203 | + _navigationView = this.FindAscendant<NavigationView.NavigationView>(); |
203 | 204 | _frame = this.FindAscendant<Frame>(); |
204 | 205 | if (_frame != null) |
205 | 206 | { |
@@ -328,8 +329,6 @@ private void UpdateView(bool animate) |
328 | 329 | /// </summary> |
329 | 330 | private void SetBackButtonVisibility(ListDetailsViewState? previousState = null) |
330 | 331 | { |
331 | | - const int backButtonVisible = 1; |
332 | | - |
333 | 332 | if (DesignMode.DesignModeEnabled) |
334 | 333 | { |
335 | 334 | return; |
@@ -358,7 +357,7 @@ private void SetBackButtonVisibility(ListDetailsViewState? previousState = null) |
358 | 357 | } |
359 | 358 | else |
360 | 359 | { |
361 | | - SetNavigationViewBackButtonState(backButtonVisible, true); |
| 360 | + SetNavigationViewBackButtonState(NavigationView.NavigationViewBackButtonVisible.Visible, true); |
362 | 361 | } |
363 | 362 | } |
364 | 363 | else if (BackButtonBehavior != BackButtonBehavior.Manual) |
@@ -441,15 +440,15 @@ private void SetVisualState(bool animate) |
441 | 440 | VisualStateManager.GoToState(this, SelectedItem == null ? noSelectionState : hasSelectionState, animate); |
442 | 441 | } |
443 | 442 |
|
444 | | - private void SetNavigationViewBackButtonState(int visible, bool enabled) |
| 443 | + private void SetNavigationViewBackButtonState(NavigationView.NavigationViewBackButtonVisible visibility, bool enabled) |
445 | 444 | { |
446 | 445 | if (_navigationView == null) |
447 | 446 | { |
448 | 447 | return; |
449 | 448 | } |
450 | 449 |
|
451 | | - _previousNavigationViewBackVisibilty = (int)_navigationView.IsBackButtonVisible; |
452 | | - _navigationView.IsBackButtonVisible = (Microsoft.UI.Xaml.Controls.NavigationViewBackButtonVisible)visible; |
| 450 | + _previousNavigationViewBackVisibilty = _navigationView.IsBackButtonVisible; |
| 451 | + _navigationView.IsBackButtonVisible = visibility; |
453 | 452 |
|
454 | 453 | _previousNavigationViewBackEnabled = _navigationView.IsBackEnabled; |
455 | 454 | _navigationView.IsBackEnabled = enabled; |
|
0 commit comments