Skip to content
This repository was archived by the owner on Nov 25, 2023. It is now read-only.

Commit 6ad486f

Browse files
committed
Modernize code
1 parent cac6805 commit 6ad486f

File tree

2 files changed

+20
-59
lines changed

2 files changed

+20
-59
lines changed

src/InvvardDev.EZLayoutDisplay.Desktop/Helper/LoggerHelper.cs

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -58,24 +58,12 @@ private static void DebugParam(Logger logger,
5858

5959
internal static LogLevel GetLogLevel(string value)
6060
{
61-
LogLevel level;
62-
63-
switch (value.ToLower())
61+
LogLevel level = value.ToLower() switch
6462
{
65-
case "debug":
66-
level = LogLevel.Debug;
67-
68-
break;
69-
case "trace":
70-
level = LogLevel.Trace;
71-
72-
break;
73-
default:
74-
level = LogLevel.Warn;
75-
76-
break;
77-
}
78-
63+
"debug" => LogLevel.Debug,
64+
"trace" => LogLevel.Trace,
65+
_ => LogLevel.Warn,
66+
};
7967
return level;
8068
}
8169

src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs

Lines changed: 15 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -388,23 +388,21 @@ private void LostFocus()
388388
private void NextLayer()
389389
{
390390
Logger.TraceRelayCommand();
391-
392391
VaryLayer(1);
393392
}
394393

395394
private void ScrollLayer(MouseWheelEventArgs e)
396395
{
397396
Logger.TraceRelayCommand();
398397

399-
if (e.Delta < 0)
398+
var variation = e switch
400399
{
401-
VaryLayer(1);
402-
}
400+
{ Delta: < 0 } => 1,
401+
{ Delta: > 0 } => -1,
402+
_ => 0
403+
};
403404

404-
if (e.Delta > 0)
405-
{
406-
VaryLayer(-1);
407-
}
405+
VaryLayer(variation);
408406
}
409407

410408
private void VaryLayer(int variation)
@@ -413,46 +411,21 @@ private void VaryLayer(int variation)
413411

414412
var maxLayerIndex = _ezLayout.EZLayers.Count - 1;
415413

416-
switch (CurrentLayerIndex)
414+
CurrentLayerIndex = variation switch
417415
{
418-
case var _ when maxLayerIndex <= 0:
419-
CurrentLayerIndex = 0;
420-
421-
break;
422-
case var _ when CurrentLayerIndex <= 0 && variation < 0:
423-
CurrentLayerIndex = maxLayerIndex;
424-
425-
break;
426-
case var _ when CurrentLayerIndex > 0 && variation < 0:
427-
CurrentLayerIndex--;
428-
429-
break;
430-
case var _ when CurrentLayerIndex >= maxLayerIndex && variation > 0:
431-
CurrentLayerIndex = 0;
432-
433-
break;
434-
case var _ when CurrentLayerIndex < maxLayerIndex && variation > 0:
435-
CurrentLayerIndex++;
436-
437-
break;
438-
}
416+
< 0 when CurrentLayerIndex <= 0 => maxLayerIndex,
417+
< 0 when CurrentLayerIndex > 0 => --CurrentLayerIndex,
418+
> 0 when CurrentLayerIndex >= maxLayerIndex => 0,
419+
> 0 when CurrentLayerIndex < maxLayerIndex => ++CurrentLayerIndex,
420+
_ => CurrentLayerIndex
421+
};
439422

440423
SwitchLayer();
441424
}
442425

443-
private bool NextLayerCanExecute()
444-
{
445-
var canExecute = _layoutTemplates.Any();
426+
private bool NextLayerCanExecute() => _layoutTemplates.Any();
446427

447-
return canExecute;
448-
}
449-
450-
private bool LostFocusCanExecute()
451-
{
452-
var canExecute = !IsWindowPinned;
453-
454-
return canExecute;
455-
}
428+
private bool LostFocusCanExecute() => !IsWindowPinned;
456429

457430
#endregion
458431

0 commit comments

Comments
 (0)