Browse Source

Merge pull request #550 from donandren/renametransformorigin

renamed Visual.TransformOrigin -> RenderTransformOrigin
pull/552/head
Steven Kirk 10 years ago
parent
commit
df834cec22
  1. 2
      src/Avalonia.Controls/LayoutTransformControl.cs
  2. 2
      src/Avalonia.Controls/Primitives/AdornerLayer.cs
  3. 4
      src/Avalonia.SceneGraph/Rendering/RendererMixin.cs
  4. 12
      src/Avalonia.SceneGraph/Visual.cs
  5. 4
      src/Avalonia.SceneGraph/VisualTree/IVisual.cs

2
src/Avalonia.Controls/LayoutTransformControl.cs

@ -139,7 +139,7 @@ namespace Avalonia.Controls
if (null != TransformRoot)
{
TransformRoot.RenderTransform = _matrixTransform;
TransformRoot.TransformOrigin = new RelativePoint(0, 0, RelativeUnit.Absolute);
TransformRoot.RenderTransformOrigin = new RelativePoint(0, 0, RelativeUnit.Absolute);
}
ApplyLayoutTransform();

2
src/Avalonia.Controls/Primitives/AdornerLayer.cs

@ -60,7 +60,7 @@ namespace Avalonia.Controls.Primitives
if (info != null)
{
child.RenderTransform = new MatrixTransform(info.Bounds.Transform);
child.TransformOrigin = new RelativePoint(new Point(0,0), RelativeUnit.Absolute);
child.RenderTransformOrigin = new RelativePoint(new Point(0,0), RelativeUnit.Absolute);
child.Arrange(info.Bounds.Bounds);
}
else

4
src/Avalonia.SceneGraph/Rendering/RendererMixin.cs

@ -104,7 +104,7 @@ namespace Avalonia.Rendering
if (visual.RenderTransform != null)
{
var origin = visual.TransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
var offset = Matrix.CreateTranslation(origin);
renderTransform = (-offset) * visual.RenderTransform.Value * (offset);
}
@ -171,7 +171,7 @@ namespace Avalonia.Rendering
}
else
{
var origin = visual.TransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
var origin = visual.RenderTransformOrigin.ToPixels(new Size(visual.Bounds.Width, visual.Bounds.Height));
var offset = Matrix.CreateTranslation(visual.Bounds.Position + origin);
var m = (-offset) * visual.RenderTransform.Value * (offset);
return visual.Bounds.TransformToAABB(m);

12
src/Avalonia.SceneGraph/Visual.cs

@ -64,10 +64,10 @@ namespace Avalonia
AvaloniaProperty.Register<Visual, Transform>(nameof(RenderTransform));
/// <summary>
/// Defines the <see cref="TransformOrigin"/> property.
/// Defines the <see cref="RenderTransformOrigin"/> property.
/// </summary>
public static readonly StyledProperty<RelativePoint> TransformOriginProperty =
AvaloniaProperty.Register<Visual, RelativePoint>(nameof(TransformOrigin), defaultValue: RelativePoint.Center);
public static readonly StyledProperty<RelativePoint> RenderTransformOriginProperty =
AvaloniaProperty.Register<Visual, RelativePoint>(nameof(RenderTransformOrigin), defaultValue: RelativePoint.Center);
/// <summary>
/// Defines the <see cref="IVisual.VisualParent"/> property.
@ -180,10 +180,10 @@ namespace Avalonia
/// <summary>
/// Gets the transform origin of the scene graph node.
/// </summary>
public RelativePoint TransformOrigin
public RelativePoint RenderTransformOrigin
{
get { return GetValue(TransformOriginProperty); }
set { SetValue(TransformOriginProperty, value); }
get { return GetValue(RenderTransformOriginProperty); }
set { SetValue(RenderTransformOriginProperty, value); }
}
/// <summary>

4
src/Avalonia.SceneGraph/VisualTree/IVisual.cs

@ -72,9 +72,9 @@ namespace Avalonia.VisualTree
Transform RenderTransform { get; set; }
/// <summary>
/// Gets or sets the transform origin of the scene graph node.
/// Gets or sets the render transform origin of the scene graph node.
/// </summary>
RelativePoint TransformOrigin { get; set; }
RelativePoint RenderTransformOrigin { get; set; }
/// <summary>
/// Gets the scene graph node's child nodes.

Loading…
Cancel
Save