From dd8787c98adcb95687075f4587a81d0de2f36896 Mon Sep 17 00:00:00 2001 From: daniel mayost Date: Wed, 6 Apr 2022 15:25:54 +0300 Subject: [PATCH] some fixes --- src/Avalonia.Controls/Control.cs | 20 +++++++++---------- src/Avalonia.Visuals/ApiCompatBaseline.txt | 4 ++-- .../Rendering/ImmediateRenderer.cs | 2 +- .../Rendering/SceneGraph/SceneBuilder.cs | 2 +- src/Avalonia.Visuals/Visual.cs | 16 +++++++-------- src/Avalonia.Visuals/VisualExtensions.cs | 2 +- src/Avalonia.Visuals/VisualTree/IVisual.cs | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs index 5337915dae..817ab1c8e6 100644 --- a/src/Avalonia.Controls/Control.cs +++ b/src/Avalonia.Controls/Control.cs @@ -367,35 +367,35 @@ namespace Avalonia.Controls } /// - /// Computes the value according to the + /// Computes the value according to the /// and /// public virtual void InvalidateFlowDirection() { - FlowDirection thisFD = this.FlowDirection; - FlowDirection parentFD = FlowDirection.LeftToRight; + var flowDirection = this.FlowDirection; + var parentFlowDirection = FlowDirection.LeftToRight; - bool thisBypassFlowDirectionPolicies = BypassFlowDirectionPolicies; + bool bypassFlowDirectionPolicies = BypassFlowDirectionPolicies; bool parentBypassFlowDirectionPolicies = false; var parent = this.FindAncestorOfType(); if (parent != null) { - parentFD = parent.FlowDirection; + parentFlowDirection = parent.FlowDirection; parentBypassFlowDirectionPolicies = parent.BypassFlowDirectionPolicies; } - else if (this.Parent is Control logicalParent) + else if (Parent is Control logicalParent) { - parentFD = logicalParent.FlowDirection; + parentFlowDirection = logicalParent.FlowDirection; parentBypassFlowDirectionPolicies = logicalParent.BypassFlowDirectionPolicies; } - bool thisShouldBeMirrored = thisFD == FlowDirection.RightToLeft && !BypassFlowDirectionPolicies; - bool parentShouldBeMirrored = parentFD == FlowDirection.RightToLeft && !parentBypassFlowDirectionPolicies; + bool thisShouldBeMirrored = flowDirection == FlowDirection.RightToLeft && !bypassFlowDirectionPolicies; + bool parentShouldBeMirrored = parentFlowDirection == FlowDirection.RightToLeft && !parentBypassFlowDirectionPolicies; bool shouldApplyMirrorTransform = thisShouldBeMirrored != parentShouldBeMirrored; - IsMirrorTransform = shouldApplyMirrorTransform; + HasMirrorTransform = shouldApplyMirrorTransform; } } } diff --git a/src/Avalonia.Visuals/ApiCompatBaseline.txt b/src/Avalonia.Visuals/ApiCompatBaseline.txt index cfe2dc2d52..0e82ef7367 100644 --- a/src/Avalonia.Visuals/ApiCompatBaseline.txt +++ b/src/Avalonia.Visuals/ApiCompatBaseline.txt @@ -182,7 +182,7 @@ InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Media.TextFo InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Media.GlyphRun Avalonia.Platform.ITextShaperImpl.ShapeText(Avalonia.Utilities.ReadOnlySlice, Avalonia.Media.Typeface, System.Double, System.Globalization.CultureInfo)' is present in the contract but not in the implementation. MembersMustExist : Member 'public Avalonia.Media.GlyphRun Avalonia.Platform.ITextShaperImpl.ShapeText(Avalonia.Utilities.ReadOnlySlice, Avalonia.Media.Typeface, System.Double, System.Globalization.CultureInfo)' does not exist in the implementation but it does exist in the contract. MembersMustExist : Member 'protected void Avalonia.Rendering.RendererBase.RenderFps(Avalonia.Platform.IDrawingContextImpl, Avalonia.Rect, System.Nullable)' does not exist in the implementation but it does exist in the contract. -InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.VisualTree.IVisual.IsMirrorTransform' is present in the implementation but not in the contract. -InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.VisualTree.IVisual.IsMirrorTransform.get()' is present in the implementation but not in the contract. +InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.VisualTree.IVisual.HasMirrorTransform' is present in the implementation but not in the contract. +InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.VisualTree.IVisual.HasMirrorTransform.get()' is present in the implementation but not in the contract. MembersMustExist : Member 'public void Avalonia.Utilities.ReadOnlySlice..ctor(System.ReadOnlyMemory, System.Int32, System.Int32)' does not exist in the implementation but it does exist in the contract. Total Issues: 186 diff --git a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs index d92919884b..2c0298affa 100644 --- a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs +++ b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs @@ -285,7 +285,7 @@ namespace Avalonia.Rendering renderTransform = (-offset) * visual.RenderTransform.Value * (offset); } - if (visual.IsMirrorTransform) + if (visual.HasMirrorTransform) { var mirrorMatrix = new Matrix(-1.0, 0.0, 0.0, 1.0, visual.Bounds.Width, 0); renderTransform *= mirrorMatrix; diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs index 4eb1c0528f..019c3e0e9b 100644 --- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs +++ b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs @@ -195,7 +195,7 @@ namespace Avalonia.Rendering.SceneGraph renderTransform = (-offset) * visual.RenderTransform.Value * (offset); } - if (visual.IsMirrorTransform) + if (visual.HasMirrorTransform) { var mirrorMatrix = new Matrix(-1.0, 0.0, 0.0, 1.0, visual.Bounds.Width, 0); renderTransform *= mirrorMatrix; diff --git a/src/Avalonia.Visuals/Visual.cs b/src/Avalonia.Visuals/Visual.cs index 42e0ad3b88..26a7d5d3b8 100644 --- a/src/Avalonia.Visuals/Visual.cs +++ b/src/Avalonia.Visuals/Visual.cs @@ -69,10 +69,10 @@ namespace Avalonia AvaloniaProperty.Register(nameof(OpacityMask)); /// - /// Defines the property. + /// Defines the property. /// - public static readonly DirectProperty IsMirrorTransformProperty = - AvaloniaProperty.RegisterDirect(nameof(IsMirrorTransform), o => o.IsMirrorTransform); + public static readonly DirectProperty HasMirrorTransformProperty = + AvaloniaProperty.RegisterDirect(nameof(HasMirrorTransform), o => o.HasMirrorTransform); /// /// Defines the property. @@ -102,7 +102,7 @@ namespace Avalonia private TransformedBounds? _transformedBounds; private IRenderRoot? _visualRoot; private IVisual? _visualParent; - private bool _isMirrorTransform; + private bool _hasMirrorTransform; /// /// Initializes static members of the class. @@ -115,7 +115,7 @@ namespace Avalonia ClipToBoundsProperty, IsVisibleProperty, OpacityProperty, - IsMirrorTransformProperty); + HasMirrorTransformProperty); RenderTransformProperty.Changed.Subscribe(RenderTransformChanged); ZIndexProperty.Changed.Subscribe(ZIndexChanged); } @@ -230,10 +230,10 @@ namespace Avalonia /// /// Gets or sets a value indicating whether to apply mirror transform on this control. /// - public bool IsMirrorTransform + public bool HasMirrorTransform { - get { return _isMirrorTransform; } - protected set { SetAndRaise(IsMirrorTransformProperty, ref _isMirrorTransform, value); } + get { return _hasMirrorTransform; } + protected set { SetAndRaise(HasMirrorTransformProperty, ref _hasMirrorTransform, value); } } /// diff --git a/src/Avalonia.Visuals/VisualExtensions.cs b/src/Avalonia.Visuals/VisualExtensions.cs index b726c1f547..3a3c2693d0 100644 --- a/src/Avalonia.Visuals/VisualExtensions.cs +++ b/src/Avalonia.Visuals/VisualExtensions.cs @@ -110,7 +110,7 @@ namespace Avalonia result *= renderTransform; } - if (v.IsMirrorTransform) + if (v.HasMirrorTransform) { var mirrorMatrix = new Matrix(-1.0, 0.0, 0.0, 1.0, v.Bounds.Width, 0); result *= mirrorMatrix; diff --git a/src/Avalonia.Visuals/VisualTree/IVisual.cs b/src/Avalonia.Visuals/VisualTree/IVisual.cs index 58c6cfa0e1..b1251618c4 100644 --- a/src/Avalonia.Visuals/VisualTree/IVisual.cs +++ b/src/Avalonia.Visuals/VisualTree/IVisual.cs @@ -78,7 +78,7 @@ namespace Avalonia.VisualTree /// /// Gets a value indicating whether to apply mirror transform on this control. /// - bool IsMirrorTransform { get; } + bool HasMirrorTransform { get; } /// /// Gets or sets the render transform of the control.