Merge branch 'master' into data-template-selectors

Author: miroiu

Nodify/Connections/BaseConnection.cs

@@ -975,6 +975,11 @@ protected override void OnRender(DrawingContext drawingContext)
                 (Vector sourceOffset, Vector targetOffset) = GetOffset();
                 drawingContext.DrawText(text, GetTextPosition(text, Source + sourceOffset, Target + targetOffset));
             }
+
+            if (AdornerLayer != null && Container is { IsKeyboardFocused: true })
+            {
+                AdornerLayer.Update(this);
+            }
         }
 
         internal void UpdateFocusVisual()
@@ -1015,7 +1020,9 @@ protected override void OnRender(DrawingContext drawingContext)
                 if (drawPen != null)
                 {
                     var widenPen = new Pen(null, _baseConnection.StrokeThickness + drawPen.Thickness + _baseConnection.FocusVisualPadding * 2d);
-                    drawingContext.DrawGeometry(null, drawPen, _baseConnection.DefiningGeometry.GetWidenedPathGeometry(widenPen));
+                    var geometry = _baseConnection.DefiningGeometry;
+                    var expandedGeometry = Geometry.Combine(geometry, geometry.GetWidenedPathGeometry(widenPen), GeometryCombineMode.Union, Transform.Identity);
+                    drawingContext.DrawGeometry(null, drawPen, expandedGeometry.GetOutlinedPathGeometry());
                 }
             }
         }