Fix shape positioning on layer LED selection change

src/Artemis.Core/Models/Profile/Layer.cs

@@ -179,8 +179,7 @@ namespace Artemis.Core.Models.Profile
             // Translation originates from the unscaled center of the shape and is tied to the anchor
             var x = position.X * AbsoluteRectangle.Width - LayerShape.RenderRectangle.Width / 2 - relativeAnchor.X;
             var y = position.Y * AbsoluteRectangle.Height - LayerShape.RenderRectangle.Height / 2 - relativeAnchor.Y;
-
-
+            
             canvas.RotateDegrees(rotation, anchor.X, anchor.Y);
             canvas.Scale(size.Width, size.Height, anchor.X, anchor.Y);
             canvas.Translate(x, y);

src/Artemis.Core/Models/Profile/LayerShapes/Ellipse.cs

@@ -15,14 +15,15 @@ namespace Artemis.Core.Models.Profile.LayerShapes
 
         public override void CalculateRenderProperties()
         {
-            RenderRectangle = GetUnscaledRectangle();
-
+            var unscaled = GetUnscaledRectangle();
+            RenderRectangle = SKRect.Create(0,0 , unscaled.Width, unscaled.Height);
+            
             var path = new SKPath();
             path.AddOval(RenderRectangle);
             RenderPath = path;
         }
 
-        public override void ApplyToEntity()
+        internal override void ApplyToEntity()
         {
             base.ApplyToEntity();
             Layer.LayerEntity.ShapeEntity.Type = ShapeEntityType.Ellipse;

src/Artemis.Core/Models/Profile/LayerShapes/Fill.cs

@@ -23,7 +23,7 @@ namespace Artemis.Core.Models.Profile.LayerShapes
             RenderPath = renderPath;
         }
 
-        public override void ApplyToEntity()
+        internal override void ApplyToEntity()
         {
             base.ApplyToEntity();
             Layer.LayerEntity.ShapeEntity.Type = ShapeEntityType.Fill;

src/Artemis.Core/Models/Profile/LayerShapes/LayerShape.cs

@@ -1,6 +1,6 @@
-using System;
-using System.Linq;
+using System.Linq;
 using Artemis.Storage.Entities.Profile;
+using RGB.NET.Core;
 using SkiaSharp;
 
 namespace Artemis.Core.Models.Profile.LayerShapes
@@ -41,18 +41,27 @@ namespace Artemis.Core.Models.Profile.LayerShapes
 
         public abstract void CalculateRenderProperties();
 
-        public virtual void ApplyToEntity()
+        /// <summary>
+        /// Updates Position and Size using the provided unscaled rectangle
+        /// </summary>
+        /// <param name="rect">An unscaled rectangle where 1px = 1mm</param>
+        public void SetFromUnscaledRectangle(SKRect rect)
         {
-            Layer.LayerEntity.ShapeEntity = new ShapeEntity
+            if (!Layer.Leds.Any())
             {
-                X = ScaledRectangle.Left,
-                Y = ScaledRectangle.Top,
-                Width = ScaledRectangle.Width,
-                Height = ScaledRectangle.Height
-            };
+                ScaledRectangle = SKRect.Empty;
+                return;
+            }
+
+            ScaledRectangle = SKRect.Create(
+                100f / Layer.AbsoluteRectangle.Width * (rect.Left - Layer.AbsoluteRectangle.Left) / 100f,
+                100f / Layer.AbsoluteRectangle.Height * (rect.Top - Layer.AbsoluteRectangle.Top) / 100f,
+                100f / Layer.AbsoluteRectangle.Width * rect.Width / 100f,
+                100f / Layer.AbsoluteRectangle.Height * rect.Height / 100f
+            );
         }
 
-        protected SKRect GetUnscaledRectangle()
+        public SKRect GetUnscaledRectangle()
         {
             if (!Layer.Leds.Any())
                 return SKRect.Empty;
@@ -64,5 +73,16 @@ namespace Artemis.Core.Models.Profile.LayerShapes
                 Layer.AbsoluteRectangle.Height * ScaledRectangle.Height
             );
         }
+
+        internal virtual void ApplyToEntity()
+        {
+            Layer.LayerEntity.ShapeEntity = new ShapeEntity
+            {
+                X = ScaledRectangle.Left,
+                Y = ScaledRectangle.Top,
+                Width = ScaledRectangle.Width,
+                Height = ScaledRectangle.Height
+            };
+        }
     }
 }

src/Artemis.Core/Models/Profile/LayerShapes/Polygon.cs

@@ -44,7 +44,7 @@ namespace Artemis.Core.Models.Profile.LayerShapes
             RenderRectangle = path.GetRect();
         }
 
-        public override void ApplyToEntity()
+        internal override void ApplyToEntity()
         {
             base.ApplyToEntity();
             Layer.LayerEntity.ShapeEntity.Type = ShapeEntityType.Polygon;

src/Artemis.Core/Models/Profile/LayerShapes/Rectangle.cs

@@ -22,7 +22,7 @@ namespace Artemis.Core.Models.Profile.LayerShapes
             RenderPath = path;
         }
 
-        public override void ApplyToEntity()
+        internal override void ApplyToEntity()
         {
             base.ApplyToEntity();
             Layer.LayerEntity.ShapeEntity.Type = ShapeEntityType.Rectangle;