From 3a17e2334dcfd2df58c4da89bf1a36e991694495 Mon Sep 17 00:00:00 2001 From: amwx <40413319+amwx@users.noreply.github.com> Date: Sun, 28 Jun 2020 17:58:28 -0500 Subject: [PATCH] Use new switch syntax Co-authored-by: Max Katz --- src/Avalonia.Controls/SplitView.cs | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/Avalonia.Controls/SplitView.cs b/src/Avalonia.Controls/SplitView.cs index df3db324a3..cc1125de2f 100644 --- a/src/Avalonia.Controls/SplitView.cs +++ b/src/Avalonia.Controls/SplitView.cs @@ -452,19 +452,16 @@ namespace Avalonia.Controls PseudoClasses.Remove($":{oldState}"); PseudoClasses.Add($":{newState}"); - var state = (SplitViewDisplayMode)e.NewValue; - //PaneColumn Specs: Width/ColumnWidth - // Overlay - 0px/0px - // CompactOverlay - CompactPaneLength/CompactPaneLength - // Inline - 0px/Auto - // CompactInline - CompactPaneLength/Auto - TemplateSettings.ClosedPaneWidth = (state == SplitViewDisplayMode.CompactInline || - state == SplitViewDisplayMode.CompactOverlay) ? CompactPaneLength : 0; - - TemplateSettings.PaneColumnGridLength = (state == SplitViewDisplayMode.CompactInline || - state == SplitViewDisplayMode.Inline) ? new GridLength(0, GridUnitType.Auto) : - state == SplitViewDisplayMode.Overlay ? new GridLength(0, GridUnitType.Pixel) : - new GridLength(CompactPaneLength, GridUnitType.Pixel); + var (closedPaneWidth, paneColumnGridLength) = (SplitViewDisplayMode)e.NewValue switch + { + SplitViewDisplayMode.Overlay => (0, new GridLength(0, GridUnitType.Pixel)), + SplitViewDisplayMode.CompactOverlay => (CompactPaneLength, new GridLength(CompactPaneLength, GridUnitType.Pixel)), + SplitViewDisplayMode.Inline => (0, new GridLength(0, GridUnitType.Auto)), + SplitViewDisplayMode.CompactInline => (CompactPaneLength, new GridLength(0, GridUnitType.Auto)), + _ => throw new NotImplementedException(), + }; + TemplateSettings.ClosedPaneWidth = closedPaneWidth; + TemplateSettings.PaneColumnGridLength = paneColumnGridLength; } private void OnUseLightDismissChanged(AvaloniaPropertyChangedEventArgs e)