Merge branch 'master' into arc-shape

src/Avalonia.Controls.DataGrid/DataGrid.cs

@@ -75,7 +75,6 @@ namespace Avalonia.Controls
         private const double DATAGRID_defaultMinColumnWidth = 20;
         private const double DATAGRID_defaultMaxColumnWidth = double.PositiveInfinity;
 
-        private List<Exception> _validationErrors;
         private List<Exception> _bindingValidationErrors;
         private IDisposable _validationSubscription;
 
@@ -102,7 +101,6 @@ namespace Avalonia.Controls
         private bool _areHandlersSuspended;
         private bool _autoSizingColumns;
         private IndexToValueTable<bool> _collapsedSlotsTable;
-        private DataGridCellCoordinates _currentCellCoordinates;
         private Control _clickedElement;
 
         // used to store the current column during a Reset
@@ -141,7 +139,6 @@ namespace Avalonia.Controls
         private DataGridSelectedItemsCollection _selectedItems;
         private bool _temporarilyResetCurrentCell;
         private object _uneditedValue; // Represents the original current cell value at the time it enters editing mode.
-        private ICellEditBinding _currentCellEditBinding;
 
         // An approximation of the sum of the heights in pixels of the scrolling rows preceding
         // the first displayed scrolling row.  Since the scrolled off rows are discarded, the grid

src/Avalonia.Controls/Application.cs

@@ -13,6 +13,7 @@ using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Styling;
 using Avalonia.Threading;
+#nullable enable
 
 namespace Avalonia
 {
@@ -35,27 +36,27 @@ namespace Avalonia
         /// <summary>
         /// The application-global data templates.
         /// </summary>
-        private DataTemplates _dataTemplates;
+        private DataTemplates? _dataTemplates;
 
         private readonly Lazy<IClipboard> _clipboard =
             new Lazy<IClipboard>(() => (IClipboard)AvaloniaLocator.Current.GetService(typeof(IClipboard)));
         private readonly Styler _styler = new Styler();
-        private Styles _styles;
+        private Styles? _styles;
-        private IResourceDictionary _resources;
+        private IResourceDictionary? _resources;
         private bool _notifyingResourcesChanged;
-        private Action<IReadOnlyList<IStyle>> _stylesAdded;
+        private Action<IReadOnlyList<IStyle>>? _stylesAdded;
-        private Action<IReadOnlyList<IStyle>> _stylesRemoved;
+        private Action<IReadOnlyList<IStyle>>? _stylesRemoved;
 
         /// <summary>
         /// Defines the <see cref="DataContext"/> property.
         /// </summary>
-        public static readonly StyledProperty<object> DataContextProperty =
+        public static readonly StyledProperty<object?> DataContextProperty =
             StyledElement.DataContextProperty.AddOwner<Application>();
 
         /// <inheritdoc/>
-        public event EventHandler<ResourcesChangedEventArgs> ResourcesChanged;
+        public event EventHandler<ResourcesChangedEventArgs>? ResourcesChanged;
 
-        public event EventHandler<UrlOpenedEventArgs> UrlsOpened; 
+        public event EventHandler<UrlOpenedEventArgs>? UrlsOpened; 
 
         /// <summary>
         /// Creates an instance of the <see cref="Application"/> class.
@@ -72,7 +73,7 @@ namespace Avalonia
         /// The data context property specifies the default object that will
         /// be used for data binding.
         /// </remarks>
-        public object DataContext
+        public object? DataContext
         {
             get { return GetValue(DataContextProperty); }
             set { SetValue(DataContextProperty, value); }
@@ -162,7 +163,7 @@ namespace Avalonia
         /// <summary>
         /// Gets the styling parent of the application, which is null.
         /// </summary>
-        IStyleHost IStyleHost.StylingParent => null;
+        IStyleHost? IStyleHost.StylingParent => null;
 
         /// <inheritdoc/>
         bool IStyleHost.IsStylesInitialized => _styles != null;
@@ -194,7 +195,7 @@ namespace Avalonia
         public virtual void Initialize() { }
 
         /// <inheritdoc/>
-        bool IResourceNode.TryGetResource(object key, out object value)
+        bool IResourceNode.TryGetResource(object key, out object? value)
         {
             value = null;
             return (_resources?.TryGetResource(key, out value) ?? false) ||
@@ -279,17 +280,17 @@ namespace Avalonia
             NotifyResourcesChanged(e);
         }
 
-        private string _name;
+        private string? _name;
         /// <summary>
         /// Defines Name property
         /// </summary>
-        public static readonly DirectProperty<Application, string> NameProperty =
+        public static readonly DirectProperty<Application, string?> NameProperty =
-            AvaloniaProperty.RegisterDirect<Application, string>("Name", o => o.Name, (o, v) => o.Name = v);
+            AvaloniaProperty.RegisterDirect<Application, string?>("Name", o => o.Name, (o, v) => o.Name = v);
 
         /// <summary>
         /// Application name to be used for various platform-specific purposes
         /// </summary>
-        public string Name
+        public string? Name
         {
             get => _name;
             set => SetAndRaise(NameProperty, ref _name, value);

src/Avalonia.Controls/Menu.cs

@@ -17,7 +17,6 @@ namespace Avalonia.Controls
         private static readonly ITemplate<IPanel> DefaultPanel =
             new FuncTemplate<IPanel>(() => new StackPanel { Orientation = Orientation.Horizontal });
 
-        private LightDismissOverlayLayer? _overlay;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Menu"/> class.

src/Avalonia.Controls/MenuItem.cs

@@ -36,7 +36,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="HotKey"/> property.
         /// </summary>
-        public static readonly StyledProperty<KeyGesture> HotKeyProperty =
+        public static readonly StyledProperty<KeyGesture?> HotKeyProperty =
             HotKeyManager.HotKeyProperty.AddOwner<MenuItem>();
 
         /// <summary>
@@ -108,7 +108,7 @@ namespace Avalonia.Controls
         private ICommand? _command;
         private bool _commandCanExecute = true;
         private Popup? _popup;
-        private KeyGesture _hotkey;
+        private KeyGesture? _hotkey;
         private bool _isEmbeddedInMenu;
 
         /// <summary>
@@ -214,7 +214,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets an <see cref="KeyGesture"/> associated with this control
         /// </summary>
-        public KeyGesture HotKey
+        public KeyGesture? HotKey
         {
             get { return GetValue(HotKeyProperty); }
             set { SetValue(HotKeyProperty, value); }

src/Avalonia.Controls/Repeater/ViewportManager.cs

@@ -27,7 +27,6 @@ namespace Avalonia.Controls
         private IScrollAnchorProvider _scroller;
         private IControl _makeAnchorElement;
         private bool _isAnchorOutsideRealizedRange;
-        private Task _cacheBuildAction;
         private Rect _visibleWindow;
         private Rect _layoutExtent;
         // This is the expected shift by the layout.

src/Avalonia.Controls/Repeater/VirtualizationInfo.cs

@@ -27,7 +27,6 @@ namespace Avalonia.Controls
     internal class VirtualizationInfo
     {
         private int _pinCounter;
-        private object _data;
 
         public Rect ArrangeBounds { get; set; }
         public bool AutoRecycleCandidate { get; set; }

src/Avalonia.Controls/TextBox.cs

@@ -1290,7 +1290,7 @@ namespace Avalonia.Controls
 
         private void UpdatePseudoclasses()
         {
-            PseudoClasses.Set(":empty", string.IsNullOrWhiteSpace(Text));
+            PseudoClasses.Set(":empty", string.IsNullOrEmpty(Text));
         }
 
         private bool IsPasswordBox => PasswordChar != default(char);

src/Avalonia.X11/TransparencyHelper.cs

@@ -10,7 +10,6 @@ namespace Avalonia.X11
         private readonly X11Globals _globals;
         private WindowTransparencyLevel _currentLevel;
         private WindowTransparencyLevel _requestedLevel;
-        private bool _isCompositing;
         private bool _blurAtomsAreSet;
         
         public Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }

src/Avalonia.X11/X11Window.cs

@@ -30,7 +30,6 @@ namespace Avalonia.X11
         ITopLevelImplWithTextInputMethod
     {
         private readonly AvaloniaX11Platform _platform;
-        private readonly IWindowImpl _popupParent;
         private readonly bool _popup;
         private readonly X11Info _x11;
         private XConfigureEvent? _configure;

src/Linux/Avalonia.LinuxFramebuffer/FramebufferToplevelImpl.cs

@@ -15,7 +15,6 @@ namespace Avalonia.LinuxFramebuffer
         private readonly IOutputBackend _outputBackend;
         private readonly IInputBackend _inputBackend;
 
-        private bool _renderQueued;
         public IInputRoot InputRoot { get; private set; }
 
         public FramebufferToplevelImpl(IOutputBackend outputBackend, IInputBackend inputBackend)

src/Linux/Avalonia.LinuxFramebuffer/Input/EvDev/EvDevTouchScreen.cs

@@ -7,7 +7,6 @@ namespace Avalonia.LinuxFramebuffer.Input.EvDev
     internal class EvDevSingleTouchScreen : EvDevDeviceHandler
     {
         private readonly IScreenInfoProvider _screenInfo;
-        private readonly int _width, _height;
         private readonly Matrix _calibration;
         private input_absinfo _axisX;
         private input_absinfo _axisY;

src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs

@@ -16,7 +16,6 @@ namespace Avalonia.LinuxFramebuffer.Output
     public unsafe class DrmOutput : IGlOutputBackend, IGlPlatformSurface
     {
         private DrmCard _card;
-        private readonly EglGlPlatformSurface _eglPlatformSurface;
         public PixelSize PixelSize => _mode.Resolution;
         public double Scaling { get; set; }
         public IGlContext PrimaryContext => _deferredContext;

src/Windows/Avalonia.Win32/WinRT/Composition/WinUICompositorConnection.cs

@@ -17,7 +17,6 @@ namespace Avalonia.Win32.WinRT.Composition
     class WinUICompositorConnection : IRenderTimer
     {
         private readonly EglContext _syncContext;
-        private IntPtr _queue;
         private ICompositor _compositor;
         private ICompositor2 _compositor2;
         private ICompositor5 _compositor5;