From 2e25164e91282e13e260e439e7daf5d992b14175 Mon Sep 17 00:00:00 2001
From: Amer Koleci <amerkoleci@gmail.com>
Date: Thu, 17 Sep 2015 23:55:31 +0200
Subject: [PATCH 1/2] Implement Canvas control #144

---
 src/Perspex.Controls/Canvas.cs               | 131 +++++++++++++++++++
 src/Perspex.Controls/Perspex.Controls.csproj |   1 +
 2 files changed, 132 insertions(+)
 create mode 100644 src/Perspex.Controls/Canvas.cs

diff --git a/src/Perspex.Controls/Canvas.cs b/src/Perspex.Controls/Canvas.cs
new file mode 100644
index 0000000000..8751466464
--- /dev/null
+++ b/src/Perspex.Controls/Canvas.cs
@@ -0,0 +1,131 @@
+// Copyright (c) The Perspex Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using Perspex.Input;
+
+namespace Perspex.Controls
+{
+    public class Canvas : Panel, INavigableContainer
+    {
+        /// <summary>
+        /// Defines the <see cref="Left"/> property.
+        /// </summary>
+        public static readonly PerspexProperty<double> LeftProperty =
+            PerspexProperty.RegisterAttached<StackPanel, Control, double>("Left");
+
+		/// <summary>
+		/// Defines the <see cref="Top"/> property.
+		/// </summary>
+		public static readonly PerspexProperty<double> TopProperty =
+			PerspexProperty.RegisterAttached<StackPanel, Control, double>("Top");
+
+		/// <summary>
+		/// Initializes static members of the <see cref="Canvas"/> class.
+		/// </summary>
+		static Canvas()
+        {
+            AffectsArrange(LeftProperty);
+			AffectsArrange(TopProperty);
+        }
+
+		/// <summary>
+		/// Gets the value of the Left attached property for a control.
+		/// </summary>
+		/// <param name="element">The control.</param>
+		/// <returns>The control's left coordinate.</returns>
+		public static double GetLeft(PerspexObject element)
+		{
+			return element.GetValue(LeftProperty);
+		}
+
+		/// <summary>
+		/// Sets the value of the Left attached property for a control.
+		/// </summary>
+		/// <param name="element">The control.</param>
+		/// <param name="value">The left value.</param>
+		public static void SetLeft(PerspexObject element, double value)
+		{
+			element.SetValue(LeftProperty, value);
+		}
+
+		/// <summary>
+		/// Gets the value of the Top attached property for a control.
+		/// </summary>
+		/// <param name="element">The control.</param>
+		/// <returns>The control's top coordinate.</returns>
+		public static double GetTop(PerspexObject element)
+		{
+			return element.GetValue(TopProperty);
+		}
+
+		/// <summary>
+		/// Sets the value of the Top attached property for a control.
+		/// </summary>
+		/// <param name="element">The control.</param>
+		/// <param name="value">The top value.</param>
+		public static void SetTop(PerspexObject element, double value)
+		{
+			element.SetValue(TopProperty, value);
+		}
+
+		/// <summary>
+		/// Gets the next control in the specified direction.
+		/// </summary>
+		/// <param name="direction">The movement direction.</param>
+		/// <param name="from">The control from which movement begins.</param>
+		/// <returns>The control.</returns>
+		IInputElement INavigableContainer.GetControl(FocusNavigationDirection direction, IInputElement from)
+        {
+			// TODO: Implement this
+			return null;
+        }
+
+        /// <summary>
+        /// Measures the control.
+        /// </summary>
+        /// <param name="availableSize">The available size.</param>
+        /// <returns>The desired size of the control.</returns>
+        protected override Size MeasureOverride(Size availableSize)
+        {
+			availableSize = new Size(double.PositiveInfinity, double.PositiveInfinity);
+
+            foreach (Control child in Children)
+            {
+                child.Measure(availableSize);
+            }
+
+			return new Size();
+        }
+
+        /// <summary>
+        /// Arranges the control's children.
+        /// </summary>
+        /// <param name="finalSize">The size allocated to the control.</param>
+        /// <returns>The space taken.</returns>
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            foreach (Control child in Children)
+            {
+				double x = 0.0;
+				double y = 0.0;
+				double elementLeft = GetLeft(child);
+
+				if (double.IsNaN(elementLeft) == false)
+				{
+					x = elementLeft;
+				}
+
+				double elementTop = GetTop(child);
+				if (double.IsNaN(elementTop) == false)
+				{
+					y = elementTop;
+				}
+
+				child.Arrange(new Rect(new Point(x, y), child.DesiredSize));
+			}
+
+			return finalSize;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Perspex.Controls/Perspex.Controls.csproj b/src/Perspex.Controls/Perspex.Controls.csproj
index dc7cbc571a..eaebc6aae6 100644
--- a/src/Perspex.Controls/Perspex.Controls.csproj
+++ b/src/Perspex.Controls/Perspex.Controls.csproj
@@ -65,6 +65,7 @@
     <Compile Include="Primitives\IScrollInfo.cs" />
     <Compile Include="Primitives\Popup.cs" />
     <Compile Include="Primitives\ScrollInfoAdapter.cs" />
+    <Compile Include="Canvas.cs" />
     <Compile Include="Templates\ControlTemplate`2.cs" />
     <Compile Include="Templates\DataTemplate`1.cs" />
     <Compile Include="Templates\IControlTemplate.cs" />

From c52495ba7ec16ac237a4aad797cd8dc140a5a730 Mon Sep 17 00:00:00 2001
From: Amer Koleci <amerkoleci@gmail.com>
Date: Thu, 17 Sep 2015 23:57:32 +0200
Subject: [PATCH 2/2] Fix tabbing.

---
 src/Perspex.Controls/Canvas.cs | 74 +++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/Perspex.Controls/Canvas.cs b/src/Perspex.Controls/Canvas.cs
index 8751466464..51db44a5ab 100644
--- a/src/Perspex.Controls/Canvas.cs
+++ b/src/Perspex.Controls/Canvas.cs
@@ -6,13 +6,13 @@ using Perspex.Input;
 
 namespace Perspex.Controls
 {
-    public class Canvas : Panel, INavigableContainer
-    {
-        /// <summary>
-        /// Defines the <see cref="Left"/> property.
-        /// </summary>
-        public static readonly PerspexProperty<double> LeftProperty =
-            PerspexProperty.RegisterAttached<StackPanel, Control, double>("Left");
+	public class Canvas : Panel, INavigableContainer
+	{
+		/// <summary>
+		/// Defines the <see cref="Left"/> property.
+		/// </summary>
+		public static readonly PerspexProperty<double> LeftProperty =
+			PerspexProperty.RegisterAttached<StackPanel, Control, double>("Left");
 
 		/// <summary>
 		/// Defines the <see cref="Top"/> property.
@@ -24,10 +24,10 @@ namespace Perspex.Controls
 		/// Initializes static members of the <see cref="Canvas"/> class.
 		/// </summary>
 		static Canvas()
-        {
-            AffectsArrange(LeftProperty);
+		{
+			AffectsArrange(LeftProperty);
 			AffectsArrange(TopProperty);
-        }
+		}
 
 		/// <summary>
 		/// Gets the value of the Left attached property for a control.
@@ -76,37 +76,37 @@ namespace Perspex.Controls
 		/// <param name="from">The control from which movement begins.</param>
 		/// <returns>The control.</returns>
 		IInputElement INavigableContainer.GetControl(FocusNavigationDirection direction, IInputElement from)
-        {
+		{
 			// TODO: Implement this
 			return null;
-        }
-
-        /// <summary>
-        /// Measures the control.
-        /// </summary>
-        /// <param name="availableSize">The available size.</param>
-        /// <returns>The desired size of the control.</returns>
-        protected override Size MeasureOverride(Size availableSize)
-        {
+		}
+
+		/// <summary>
+		/// Measures the control.
+		/// </summary>
+		/// <param name="availableSize">The available size.</param>
+		/// <returns>The desired size of the control.</returns>
+		protected override Size MeasureOverride(Size availableSize)
+		{
 			availableSize = new Size(double.PositiveInfinity, double.PositiveInfinity);
 
-            foreach (Control child in Children)
-            {
-                child.Measure(availableSize);
-            }
+			foreach (Control child in Children)
+			{
+				child.Measure(availableSize);
+			}
 
 			return new Size();
-        }
-
-        /// <summary>
-        /// Arranges the control's children.
-        /// </summary>
-        /// <param name="finalSize">The size allocated to the control.</param>
-        /// <returns>The space taken.</returns>
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            foreach (Control child in Children)
-            {
+		}
+
+		/// <summary>
+		/// Arranges the control's children.
+		/// </summary>
+		/// <param name="finalSize">The size allocated to the control.</param>
+		/// <returns>The space taken.</returns>
+		protected override Size ArrangeOverride(Size finalSize)
+		{
+			foreach (Control child in Children)
+			{
 				double x = 0.0;
 				double y = 0.0;
 				double elementLeft = GetLeft(child);
@@ -126,6 +126,6 @@ namespace Perspex.Controls
 			}
 
 			return finalSize;
-        }
-    }
+		}
+	}
 }
\ No newline at end of file