Automated JetBrains cleanup

Co-authored-by: <[email protected]>
jinek · Dec 15, 2024 · 51b89aa · 51b89aa
1 parent d2db200
commit 51b89aa
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/src/Consolonia.Core/Infrastructure/ConsoleWindow.cs b/src/Consolonia.Core/Infrastructure/ConsoleWindow.cs
@@ -23,16 +23,15 @@ namespace Consolonia.Core.Infrastructure
 {
     public class ConsoleWindow : IWindowImpl
     {
+        private readonly bool _accessKeysAlwaysOn;
+        private readonly IDisposable _accessKeysAlwaysOnDisposable;
         private readonly IKeyboardDevice _myKeyboardDevice;
         private readonly TimeSpan _resizeDelay = TimeSpan.FromMilliseconds(100);
         [NotNull] internal readonly IConsole Console;
         private bool _disposedValue;
         private IInputRoot _inputRoot;
         private CancellationTokenSource _resizeCancellationTokenSource;
 
-        private bool _accessKeysAlwaysOn;
-        private IDisposable _accessKeysAlwaysOnDisposable;
-
         public ConsoleWindow()
         {
             _myKeyboardDevice = AvaloniaLocator.Current.GetService<IKeyboardDevice>();
@@ -45,16 +44,9 @@ public ConsoleWindow()
             Handle = null!;
             PixelBuffer = new PixelBuffer(Console.Size);
             _accessKeysAlwaysOn = !Console.SupportsAltSolo;
-            if(_accessKeysAlwaysOn)
-                _accessKeysAlwaysOnDisposable = AccessText.ShowAccessKeyProperty.Changed.SubscribeAction(OnShowAccessKeyPropertyChanged);
-        }
-
-        private void OnShowAccessKeyPropertyChanged(AvaloniaPropertyChangedEventArgs<bool> args)
-        {
-            if (args.Sender != _inputRoot) return;
-            if (args.GetNewValue<bool>()) return;
-
-            _inputRoot.ShowAccessKeys = true;
+            if (_accessKeysAlwaysOn)
+                _accessKeysAlwaysOnDisposable =
+                    AccessText.ShowAccessKeyProperty.Changed.SubscribeAction(OnShowAccessKeyPropertyChanged);
         }
 
         public PixelBuffer PixelBuffer { get; set; }
@@ -65,7 +57,7 @@ private void OnShowAccessKeyPropertyChanged(AvaloniaPropertyChangedEventArgs<boo
         public void SetInputRoot(IInputRoot inputRoot)
         {
             _inputRoot = inputRoot;
-            if(_accessKeysAlwaysOn)
+            if (_accessKeysAlwaysOn)
                 _inputRoot.ShowAccessKeys = true;
         }
 
@@ -314,6 +306,14 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
 
+        private void OnShowAccessKeyPropertyChanged(AvaloniaPropertyChangedEventArgs<bool> args)
+        {
+            if (args.Sender != _inputRoot) return;
+            if (args.GetNewValue<bool>()) return;
+
+            _inputRoot.ShowAccessKeys = true;
+        }
+
         private void ConsoleOnMouseEvent(RawPointerEventType type, Point point, Vector? wheelDelta,
             RawInputModifiers modifiers)
         {

diff --git a/src/Consolonia.Core/Infrastructure/DefaultNetConsole.cs b/src/Consolonia.Core/Infrastructure/DefaultNetConsole.cs
@@ -47,14 +47,14 @@ public DefaultNetConsole()
             StartInputReading();
         }
 
+        public override bool SupportsAltSolo => false;
+
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);
             RaiseFocusEvent(false);
         }
 
-        public override bool SupportsAltSolo => false;
-
         public override void PauseIO(Task task)
         {
             base.PauseIO(task);

diff --git a/src/Consolonia.Core/Infrastructure/IConsole.cs b/src/Consolonia.Core/Infrastructure/IConsole.cs
@@ -20,6 +20,7 @@ public interface IConsole : IDisposable
         ///     This is true if console supports composing multiple emojis together (like: 👨‍👩‍👧‍👦).
         /// </summary>
         bool SupportsComplexEmoji { get; }
+
         bool SupportsAltSolo { get; }
 
         void SetTitle(string title);

diff --git a/src/Consolonia.PlatformSupport/CursesConsole.cs b/src/Consolonia.PlatformSupport/CursesConsole.cs
@@ -115,6 +115,8 @@ public CursesConsole()
             StartEventLoop();
         }
 
+        public override bool SupportsAltSolo => false;
+
         private void StartEventLoop()
         {
             //todo: cleanup
@@ -140,8 +142,6 @@ private void StartEventLoop()
             });
         }
 
-        public override bool SupportsAltSolo => false;
-
         public override void PauseIO(Task task)
         {
             base.PauseIO(task);