From 282071751d9ebfdbf66c3be61851f23e54fae8dc Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Fri, 19 Aug 2022 18:05:42 +0200 Subject: [PATCH 1/3] fix: CS0169 Never used field --- src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs | 1 - src/Avalonia.X11/NativeDialogs/Gtk.cs | 3 --- .../Avalonia.LinuxFramebuffer/Input/EvDev/EvDevBackend.cs | 1 - 3 files changed, 5 deletions(-) diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs index dc2b2cd7cc..79cf909e55 100644 --- a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs +++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs @@ -129,7 +129,6 @@ namespace Avalonia.Controls private bool _clipValueToMinMax; private bool _isSyncingTextAndValueProperties; private bool _isTextChangedFromUI; - private CultureInfo? _cultureInfo; private NumberStyles _parsingNumberStyle = NumberStyles.Any; private NumberFormatInfo? _numberFormat; diff --git a/src/Avalonia.X11/NativeDialogs/Gtk.cs b/src/Avalonia.X11/NativeDialogs/Gtk.cs index ae04c072a5..d5eae037a9 100644 --- a/src/Avalonia.X11/NativeDialogs/Gtk.cs +++ b/src/Avalonia.X11/NativeDialogs/Gtk.cs @@ -258,9 +258,6 @@ namespace Avalonia.X11.NativeDialogs public static IntPtr GetForeignWindow(IntPtr xid) => gdk_x11_window_foreign_new_for_display(s_display, xid); - static object s_startGtkLock = new(); - static Task s_startGtkTask; - public static Task StartGtk() { return StartGtkCore(); diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Input/EvDev/EvDevBackend.cs b/src/Linux/Avalonia.LinuxFramebuffer/Input/EvDev/EvDevBackend.cs index 2eb10ae666..1e3c4bed48 100644 --- a/src/Linux/Avalonia.LinuxFramebuffer/Input/EvDev/EvDevBackend.cs +++ b/src/Linux/Avalonia.LinuxFramebuffer/Input/EvDev/EvDevBackend.cs @@ -13,7 +13,6 @@ namespace Avalonia.LinuxFramebuffer.Input.EvDev private readonly EvDevDeviceDescription[] _deviceDescriptions; private readonly List _handlers = new List(); private int _epoll; - private bool _isQueueHandlerTriggered; private object _lock = new object(); private Action _onInput; private IInputRoot _inputRoot; From 404bb8745ee834d11d5a30cada7428c78d810bab Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Fri, 19 Aug 2022 18:09:41 +0200 Subject: [PATCH 2/3] fix: Warning CS0168 The variable 'e' is declared but never used --- tests/Avalonia.IntegrationTests.Appium/WindowTests.cs | 2 +- tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs index 382306ac83..9cce169744 100644 --- a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs +++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs @@ -230,7 +230,7 @@ namespace Avalonia.IntegrationTests.Appium PixelRect.Parse(_session.FindElementByAccessibilityId("ScreenRect").Text), double.Parse(_session.FindElementByAccessibilityId("Scaling").Text)); } - catch (OpenQA.Selenium.NoSuchElementException e) when (retry++ < 3) + catch (OpenQA.Selenium.NoSuchElementException) when (retry++ < 3) { // MacOS sometimes seems to need a bit of time to get itself back in order after switching out // of fullscreen. diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs index 4e5344dd25..facb25c18e 100644 --- a/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs +++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs @@ -30,7 +30,7 @@ namespace Avalonia.IntegrationTests.Appium tab.Click(); return; } - catch (WebDriverException e) when (retry++ < 3) + catch (WebDriverException) when (retry++ < 3) { // MacOS sometimes seems to need a bit of time to get itself back in order after switching out // of fullscreen. From fab2fe7aa0dcc4c36bc6d9a2a2b0895015d20d63 Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Fri, 19 Aug 2022 18:12:44 +0200 Subject: [PATCH 3/3] fix: Warning CS0414 The field is assigned but its value is never used --- src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs | 3 --- src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs b/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs index 07db6013c7..338a3420fa 100644 --- a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs +++ b/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs @@ -42,7 +42,6 @@ namespace Avalonia.Web.Blazor private GRGlInterface? _glInterface; private const SKColorType ColorType = SKColorType.Rgba8888; - private bool _initialised; private bool _useGL; private bool _inputElementFocused; @@ -300,8 +299,6 @@ namespace Avalonia.Web.Blazor _interop.SetCanvasSize((int)(_canvasSize.Width * _dpi), (int)(_canvasSize.Height * _dpi)); - _initialised = true; - Threading.Dispatcher.UIThread.Post(async () => { _interop.RequestAnimationFrame(true); diff --git a/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs b/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs index 3adefd965f..92e2b0689e 100644 --- a/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs +++ b/src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs @@ -17,7 +17,6 @@ namespace Avalonia.Win32.Input private bool _active; private bool _showCompositionWindow; private Imm32CaretManager _caretManager = new(); - private bool _showCandidateList; private ushort _langId; private const int _caretMargin = 1; @@ -32,7 +31,6 @@ namespace Avalonia.Win32.Input _active = false; _langId = PRIMARYLANGID(LGID(HKL)); _showCompositionWindow = true; - _showCandidateList = true; IsComposing = false; } @@ -50,7 +48,6 @@ namespace Avalonia.Win32.Input _active = false; _langId = 0; _showCompositionWindow = false; - _showCandidateList = false; IsComposing = false; }