diff --git a/src/Avalonia.Base/Interactivity/Interactive.cs b/src/Avalonia.Base/Interactivity/Interactive.cs
index 821e00d784..0dfaae0fc1 100644
--- a/src/Avalonia.Base/Interactivity/Interactive.cs
+++ b/src/Avalonia.Base/Interactivity/Interactive.cs
@@ -17,7 +17,7 @@ namespace Avalonia.Interactivity
///
/// Gets the interactive parent of the object for bubbling and tunneling events.
///
- protected internal virtual Interactive? InteractiveParent => VisualParent as Interactive;
+ internal virtual Interactive? InteractiveParent => VisualParent as Interactive;
///
/// Adds a handler for the specified routed event.
diff --git a/src/Avalonia.Base/Media/ArcSegment.cs b/src/Avalonia.Base/Media/ArcSegment.cs
index b7dbd4925b..ee353b0a89 100644
--- a/src/Avalonia.Base/Media/ArcSegment.cs
+++ b/src/Avalonia.Base/Media/ArcSegment.cs
@@ -95,7 +95,7 @@ namespace Avalonia.Media
set { SetValue(SweepDirectionProperty, value); }
}
- protected internal override void ApplyTo(StreamGeometryContext ctx)
+ internal override void ApplyTo(StreamGeometryContext ctx)
{
ctx.ArcTo(Point, Size, RotationAngle, IsLargeArc, SweepDirection);
}
diff --git a/src/Avalonia.Base/Media/BezierSegment .cs b/src/Avalonia.Base/Media/BezierSegment .cs
index 64ea2924cc..31efe1ec23 100644
--- a/src/Avalonia.Base/Media/BezierSegment .cs
+++ b/src/Avalonia.Base/Media/BezierSegment .cs
@@ -56,7 +56,7 @@ namespace Avalonia.Media
set { SetValue(Point3Property, value); }
}
- protected internal override void ApplyTo(StreamGeometryContext ctx)
+ internal override void ApplyTo(StreamGeometryContext ctx)
{
ctx.CubicBezierTo(Point1, Point2, Point3);
}
diff --git a/src/Avalonia.Base/Media/Imaging/Bitmap.cs b/src/Avalonia.Base/Media/Imaging/Bitmap.cs
index fc31077221..fbe9370edc 100644
--- a/src/Avalonia.Base/Media/Imaging/Bitmap.cs
+++ b/src/Avalonia.Base/Media/Imaging/Bitmap.cs
@@ -173,7 +173,7 @@ namespace Avalonia.Media.Imaging
public virtual PixelFormat? Format => (PlatformImpl.Item as IReadableBitmapImpl)?.Format;
- protected internal unsafe void CopyPixelsCore(PixelRect sourceRect, IntPtr buffer, int bufferSize, int stride,
+ private protected unsafe void CopyPixelsCore(PixelRect sourceRect, IntPtr buffer, int bufferSize, int stride,
ILockedFramebuffer fb)
{
if ((sourceRect.Width <= 0 || sourceRect.Height <= 0) && (sourceRect.X != 0 || sourceRect.Y != 0))
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableTileBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableTileBrush.cs
index 2781141f06..df6d14ecf9 100644
--- a/src/Avalonia.Base/Media/Immutable/ImmutableTileBrush.cs
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableTileBrush.cs
@@ -21,7 +21,7 @@ namespace Avalonia.Media.Immutable
/// How the source rectangle will be stretched to fill the destination rect.
///
/// The tile mode.
- protected internal ImmutableTileBrush(
+ private protected ImmutableTileBrush(
AlignmentX alignmentX,
AlignmentY alignmentY,
RelativeRect destinationRect,
diff --git a/src/Avalonia.Base/Media/LineSegment.cs b/src/Avalonia.Base/Media/LineSegment.cs
index 5729ab2c3b..68193bb770 100644
--- a/src/Avalonia.Base/Media/LineSegment.cs
+++ b/src/Avalonia.Base/Media/LineSegment.cs
@@ -22,7 +22,7 @@ namespace Avalonia.Media
set { SetValue(PointProperty, value); }
}
- protected internal override void ApplyTo(StreamGeometryContext ctx)
+ internal override void ApplyTo(StreamGeometryContext ctx)
{
ctx.LineTo(Point);
}
diff --git a/src/Avalonia.Base/Media/PathSegment.cs b/src/Avalonia.Base/Media/PathSegment.cs
index 89a33815ae..0b517e56f3 100644
--- a/src/Avalonia.Base/Media/PathSegment.cs
+++ b/src/Avalonia.Base/Media/PathSegment.cs
@@ -2,6 +2,6 @@ namespace Avalonia.Media
{
public abstract class PathSegment : AvaloniaObject
{
- protected internal abstract void ApplyTo(StreamGeometryContext ctx);
+ internal abstract void ApplyTo(StreamGeometryContext ctx);
}
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Media/PolyLineSegment.cs b/src/Avalonia.Base/Media/PolyLineSegment.cs
index 51bf13d7cb..49c34fea66 100644
--- a/src/Avalonia.Base/Media/PolyLineSegment.cs
+++ b/src/Avalonia.Base/Media/PolyLineSegment.cs
@@ -44,7 +44,7 @@ namespace Avalonia.Media
Points = new Points(points);
}
- protected internal override void ApplyTo(StreamGeometryContext ctx)
+ internal override void ApplyTo(StreamGeometryContext ctx)
{
var points = Points;
if (points.Count > 0)
diff --git a/src/Avalonia.Base/Media/QuadraticBezierSegment .cs b/src/Avalonia.Base/Media/QuadraticBezierSegment .cs
index 9dc24e2a93..01d22f2043 100644
--- a/src/Avalonia.Base/Media/QuadraticBezierSegment .cs
+++ b/src/Avalonia.Base/Media/QuadraticBezierSegment .cs
@@ -40,7 +40,7 @@ namespace Avalonia.Media
set { SetValue(Point2Property, value); }
}
- protected internal override void ApplyTo(StreamGeometryContext ctx)
+ internal override void ApplyTo(StreamGeometryContext ctx)
{
ctx.QuadraticBezierTo(Point1, Point2);
}
diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index 1704965fd7..3ee50ab547 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -302,7 +302,7 @@ namespace Avalonia.Controls.Presenters
///
/// This method is automatically called when the control is attached to a visual tree.
///
- protected internal virtual void AttachToScrollViewer()
+ internal void AttachToScrollViewer()
{
var owner = this.FindAncestorOfType();
diff --git a/src/Avalonia.Controls/Primitives/AccessText.cs b/src/Avalonia.Controls/Primitives/AccessText.cs
index ed3412bb45..c5dbc3000f 100644
--- a/src/Avalonia.Controls/Primitives/AccessText.cs
+++ b/src/Avalonia.Controls/Primitives/AccessText.cs
@@ -60,7 +60,7 @@ namespace Avalonia.Controls.Primitives
/// Renders the to a drawing context.
///
/// The drawing context.
- protected internal override void RenderCore(DrawingContext context)
+ private protected override void RenderCore(DrawingContext context)
{
base.RenderCore(context);
int underscore = Text?.IndexOf('_') ?? -1;
diff --git a/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs b/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
index 7ed055f2e5..99fd4cd1dc 100644
--- a/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
+++ b/src/Avalonia.Controls/Primitives/OverlayPopupHost.cs
@@ -51,7 +51,7 @@ namespace Avalonia.Controls.Primitives
}
///
- protected internal override Interactive? InteractiveParent => Parent as Interactive;
+ internal override Interactive? InteractiveParent => Parent as Interactive;
///
public void Dispose() => Hide();
diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index a2034a2dbb..aef97bce36 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -72,7 +72,7 @@ namespace Avalonia.Controls.Primitives
///
/// Popup events are passed to their parent window. This facilitates this.
///
- protected internal override Interactive? InteractiveParent => (Interactive?)Parent;
+ internal override Interactive? InteractiveParent => (Interactive?)Parent;
///
/// Gets the control that is hosting the popup root.
diff --git a/src/Avalonia.Controls/Primitives/ScrollBar.cs b/src/Avalonia.Controls/Primitives/ScrollBar.cs
index 37aa1ebffd..86bea8daa5 100644
--- a/src/Avalonia.Controls/Primitives/ScrollBar.cs
+++ b/src/Avalonia.Controls/Primitives/ScrollBar.cs
@@ -200,7 +200,7 @@ namespace Avalonia.Controls.Primitives
///
/// This method is automatically called when the control is attached to a visual tree.
///
- protected internal virtual void AttachToScrollViewer()
+ internal void AttachToScrollViewer()
{
var owner = this.FindAncestorOfType();
diff --git a/src/Avalonia.Controls/TextBlock.cs b/src/Avalonia.Controls/TextBlock.cs
index adef052db8..c1edf23c89 100644
--- a/src/Avalonia.Controls/TextBlock.cs
+++ b/src/Avalonia.Controls/TextBlock.cs
@@ -555,7 +555,7 @@ namespace Avalonia.Controls
}
// Workaround to seal Render method, we need to make so because AccessText was overriding Render method which is sealed now.
- internal protected virtual void RenderCore(DrawingContext context)
+ private protected virtual void RenderCore(DrawingContext context)
{
var background = Background;
diff --git a/src/Avalonia.Controls/Viewbox.cs b/src/Avalonia.Controls/Viewbox.cs
index 1518fb49e3..b21a04c1d4 100644
--- a/src/Avalonia.Controls/Viewbox.cs
+++ b/src/Avalonia.Controls/Viewbox.cs
@@ -82,7 +82,7 @@ namespace Avalonia.Controls
/// Gets or sets the transform applied to the container visual that
/// hosts the child of the Viewbox
///
- protected internal ITransform? InternalTransform
+ internal ITransform? InternalTransform
{
get => _containerVisual.RenderTransform;
set => _containerVisual.RenderTransform = value;