Merge branch 'master' into dbus-tray-icon-fix

native/Avalonia.Native/src/OSX/window.mm

@@ -52,7 +52,6 @@ public:
         [Window setBackingType:NSBackingStoreBuffered];
         
         [Window setOpaque:false];
-        [Window setContentView: StandardContainer];
     }
     
     virtual HRESULT ObtainNSWindowHandle(void** ret) override
@@ -125,6 +124,8 @@ public:
             SetPosition(lastPositionSet);
             UpdateStyle();
             
+            [Window setContentView: StandardContainer];
+            
             [Window setTitle:_lastTitle];
             
             if(ShouldTakeFocusOnShow() && activate)
@@ -323,6 +324,7 @@ public:
                     BaseEvents->Resized(AvnSize{x,y}, reason);
                 }
                 
+                [StandardContainer setFrameSize:NSSize{x,y}];
                 [Window setContentSize:NSSize{x, y}];
             }
             @finally

src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs

@@ -35,6 +35,7 @@ namespace Avalonia.Controls
 
         private const int DATAGRIDCOLUMNHEADER_resizeRegionWidth = 5;
         private const double DATAGRIDCOLUMNHEADER_separatorThickness = 1;
+        private const int DATAGRIDCOLUMNHEADER_columnsDragTreshold = 5;
 
         private bool _areHandlersSuspended;
         private static DragMode _dragMode;
@@ -448,19 +449,6 @@ namespace Avalonia.Controls
 
             OnMouseMove_Reorder(ref handled, mousePosition, mousePositionHeaders, distanceFromLeft, distanceFromRight);
 
-            // if we still haven't done anything about moving the mouse while 
-            // the button is down, we remember that we're dragging, but we don't 
-            // claim to have actually handled the event
-            if (_dragMode == DragMode.MouseDown)
-            {
-                _dragMode = DragMode.Drag;
-            }
-
-            _lastMousePositionHeaders = mousePositionHeaders;
-            
-            if (args.Pointer.Captured != this && _dragMode == DragMode.Drag)
-                args.Pointer.Capture(this);
-            
             SetDragCursor(mousePosition);
         }
 
@@ -732,15 +720,19 @@ namespace Avalonia.Controls
             {
                 return;
             }
-
+            
             //handle entry into reorder mode
-            if (_dragMode == DragMode.MouseDown && _dragColumn == null && (distanceFromRight > DATAGRIDCOLUMNHEADER_resizeRegionWidth && distanceFromLeft > DATAGRIDCOLUMNHEADER_resizeRegionWidth))
+            if (_dragMode == DragMode.MouseDown && _dragColumn == null && _lastMousePositionHeaders != null && (distanceFromRight > DATAGRIDCOLUMNHEADER_resizeRegionWidth && distanceFromLeft > DATAGRIDCOLUMNHEADER_resizeRegionWidth))
             {
-                handled = CanReorderColumn(OwningColumn);
+                var distanceFromInitial = (Vector)(mousePositionHeaders - _lastMousePositionHeaders);
-
+                if (distanceFromInitial.Length > DATAGRIDCOLUMNHEADER_columnsDragTreshold)
-                if (handled)
                 {
-                    OnMouseMove_BeginReorder(mousePosition);
+                    handled = CanReorderColumn(OwningColumn);
+
+                    if (handled)
+                    {
+                        OnMouseMove_BeginReorder(mousePosition);
+                    }
                 }
             }
 

src/Avalonia.Diagnostics/Diagnostics/Models/EventChainLink.cs

@@ -29,7 +29,7 @@ namespace Avalonia.Diagnostics.Models
             }
         }
 
-        public bool Handled { get; }
+        public bool Handled { get; set; }
 
         public RoutingStrategies Route { get; }
     }

src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs

@@ -55,6 +55,8 @@ namespace Avalonia.Diagnostics.ViewModels
 
                 // FIXME: This leaks event handlers.
                 Event.AddClassHandler(typeof(object), HandleEvent, allRoutes, handledEventsToo: true);
+                Event.RouteFinished.Subscribe(HandleRouteFinished);
+                
                 _isRegistered = true;
             }
         }
@@ -92,6 +94,30 @@ namespace Avalonia.Diagnostics.ViewModels
             else
                 handler();
         }
+        
+        private void HandleRouteFinished(RoutedEventArgs e)
+        {
+            if (!_isRegistered || IsEnabled == false)
+                return;
+            if (e.Source is IVisual v && BelongsToDevTool(v))
+                return;
+
+            var s = e.Source;
+            var handled = e.Handled;
+            var route = e.Route;
+
+            void handler()
+            {
+                if (_currentEvent != null && handled)
+                {
+                    var linkIndex = _currentEvent.EventChain.Count - 1;
+                    var link = _currentEvent.EventChain[linkIndex];
+
+                    link.Handled = true;
+                    _currentEvent.HandledBy = link;
+                }
+            }
+        }
 
         private static bool BelongsToDevTool(IVisual v)
         {

src/Avalonia.Diagnostics/Diagnostics/ViewModels/FiredEvent.cs

@@ -63,8 +63,8 @@ namespace Avalonia.Diagnostics.ViewModels
         {
             if (EventChain.Count > 0)
             {
-                var prevLink = EventChain[EventChain.Count-1];
+                var prevLink = EventChain[EventChain.Count - 1];
-
+                
                 if (prevLink.Route != link.Route)
                 {
                     link.BeginsNewRoute = true;
@@ -72,6 +72,7 @@ namespace Avalonia.Diagnostics.ViewModels
             }
 
             EventChain.Add(link);
+
             if (HandledBy == null && link.Handled)
                 HandledBy = link;
         }