summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Platform.WP8
diff options
context:
space:
mode:
authorStephane Delcroix <stephane@delcroix.org>2017-02-06 15:18:16 +0100
committerStephane Delcroix <stephane@delcroix.org>2017-02-06 15:18:16 +0100
commitfaa6eae8e72d810c8d16dd92e02b305dbf35548c (patch)
tree78a91ae8be6dd37b03c2f345b54c07472d7f58b9 /Xamarin.Forms.Platform.WP8
parentfc7d556848e731902d096953c9b4fb28a2466e6b (diff)
downloadxamarin-forms-faa6eae8e72d810c8d16dd92e02b305dbf35548c.tar.gz
xamarin-forms-faa6eae8e72d810c8d16dd92e02b305dbf35548c.tar.bz2
xamarin-forms-faa6eae8e72d810c8d16dd92e02b305dbf35548c.zip
Revert "[*] ScaleX and ScaleY"
This reverts commit fc7d556848e731902d096953c9b4fb28a2466e6b.
Diffstat (limited to 'Xamarin.Forms.Platform.WP8')
-rw-r--r--Xamarin.Forms.Platform.WP8/VisualElementTracker.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Xamarin.Forms.Platform.WP8/VisualElementTracker.cs b/Xamarin.Forms.Platform.WP8/VisualElementTracker.cs
index c197bbfc..45b51a95 100644
--- a/Xamarin.Forms.Platform.WP8/VisualElementTracker.cs
+++ b/Xamarin.Forms.Platform.WP8/VisualElementTracker.cs
@@ -160,7 +160,7 @@ namespace Xamarin.Forms.Platform.WinPhone
MaybeInvalidate();
else if (e.PropertyName == VisualElement.AnchorXProperty.PropertyName || e.PropertyName == VisualElement.AnchorYProperty.PropertyName)
UpdateScaleAndRotation(Model, Element);
- else if (e.PropertyName == VisualElement.ScaleProperty.PropertyName || e.PropertyName == VisualElement.ScaleXProperty.PropertyName || e.PropertyName == VisualElement.ScaleYProperty.PropertyName )
+ else if (e.PropertyName == VisualElement.ScaleProperty.PropertyName)
UpdateScaleAndRotation(Model, Element);
else if (e.PropertyName == VisualElement.TranslationXProperty.PropertyName || e.PropertyName == VisualElement.TranslationYProperty.PropertyName ||
e.PropertyName == VisualElement.RotationProperty.PropertyName || e.PropertyName == VisualElement.RotationXProperty.PropertyName || e.PropertyName == VisualElement.RotationYProperty.PropertyName)
@@ -350,8 +350,9 @@ namespace Xamarin.Forms.Platform.WinPhone
{
double anchorX = view.AnchorX;
double anchorY = view.AnchorY;
+ double scale = view.Scale;
frameworkElement.RenderTransformOrigin = new System.Windows.Point(anchorX, anchorY);
- frameworkElement.RenderTransform = new ScaleTransform { ScaleX = view.Scale * view.ScaleX, ScaleY = view.Scale * view.ScaleY };
+ frameworkElement.RenderTransform = new ScaleTransform { ScaleX = scale, ScaleY = scale };
UpdateRotation(view, frameworkElement);
}