Browse Source

Merge pull request #8786 from workgroupengineering/fixes/Warnings/Unused-field

Fixes warnings unused fields
pull/8920/head
Max Katz 4 years ago
committed by GitHub
parent
commit
c25f32d123
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
  2. 3
      src/Avalonia.X11/NativeDialogs/Gtk.cs
  3. 1
      src/Linux/Avalonia.LinuxFramebuffer/Input/EvDev/EvDevBackend.cs
  4. 3
      src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
  5. 3
      src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs
  6. 2
      tests/Avalonia.IntegrationTests.Appium/WindowTests.cs

1
src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs

@ -138,7 +138,6 @@ namespace Avalonia.Controls
private bool _clipValueToMinMax;
private bool _isSyncingTextAndValueProperties;
private bool _isTextChangedFromUI;
private CultureInfo? _cultureInfo;
private NumberStyles _parsingNumberStyle = NumberStyles.Any;
private NumberFormatInfo? _numberFormat;

3
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<bool> s_startGtkTask;
public static Task<bool> StartGtk()
{
return StartGtkCore();

1
src/Linux/Avalonia.LinuxFramebuffer/Input/EvDev/EvDevBackend.cs

@ -13,7 +13,6 @@ namespace Avalonia.LinuxFramebuffer.Input.EvDev
private readonly EvDevDeviceDescription[] _deviceDescriptions;
private readonly List<EvDevDeviceHandler> _handlers = new List<EvDevDeviceHandler>();
private int _epoll;
private bool _isQueueHandlerTriggered;
private object _lock = new object();
private Action<RawInputEventArgs> _onInput;
private IInputRoot _inputRoot;

3
src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs

@ -46,7 +46,6 @@ namespace Avalonia.Web.Blazor
private GRGlInterface? _glInterface;
private const SKColorType ColorType = SKColorType.Rgba8888;
private bool _initialised;
private bool _useGL;
private bool _inputElementFocused;
@ -307,8 +306,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);

3
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;
}

2
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.

Loading…
Cancel
Save