From 852711aa110792be2228eda09e4a357c6f21142a Mon Sep 17 00:00:00 2001
From: SpoinkyNL <mail@rbeekman.nl>
Date: Thu, 4 Jun 2020 19:51:10 +0200
Subject: [PATCH] Layer brushes - Moved abstract classes to their own namespace

Layer properties - Fixed draggable input text positions
---
 src/Artemis.Core/Models/Profile/Layer.cs                    | 1 +
 .../Plugins/LayerBrush/{ => Abstract}/BaseLayerBrush.cs     | 4 +---
 .../Plugins/LayerBrush/{ => Abstract}/LayerBrush.cs         | 2 +-
 .../LayerBrush/{ => Abstract}/PropertiesLayerBrush.cs       | 2 +-
 .../Plugins/LayerBrush/{ => Abstract}/RgbNetLayerBrush.cs   | 2 +-
 src/Artemis.Core/Plugins/LayerBrush/LayerBrushProvider.cs   | 1 +
 src/Artemis.Core/Services/Interfaces/ILayerService.cs       | 1 +
 src/Artemis.Core/Services/LayerService.cs                   | 1 +
 src/Artemis.UI.Shared/Controls/DraggableFloat.xaml          | 6 +++---
 .../LayerProperties/LayerPropertiesViewModel.cs             | 1 +
 .../Module/ProfileEditor/Visualization/ProfileViewModel.cs  | 1 +
 .../Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs        | 3 ++-
 .../RgbNetColorBrush.cs                                     | 1 +
 .../Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs        | 1 +
 14 files changed, 17 insertions(+), 10 deletions(-)
 rename src/Artemis.Core/Plugins/LayerBrush/{ => Abstract}/BaseLayerBrush.cs (96%)
 rename src/Artemis.Core/Plugins/LayerBrush/{ => Abstract}/LayerBrush.cs (97%)
 rename src/Artemis.Core/Plugins/LayerBrush/{ => Abstract}/PropertiesLayerBrush.cs (97%)
 rename src/Artemis.Core/Plugins/LayerBrush/{ => Abstract}/RgbNetLayerBrush.cs (98%)

diff --git a/src/Artemis.Core/Models/Profile/Layer.cs b/src/Artemis.Core/Models/Profile/Layer.cs
index b5706b9e3..5ed105b92 100644
--- a/src/Artemis.Core/Models/Profile/Layer.cs
+++ b/src/Artemis.Core/Models/Profile/Layer.cs
@@ -8,6 +8,7 @@ using Artemis.Core.Models.Profile.LayerProperties.Attributes;
 using Artemis.Core.Models.Profile.LayerShapes;
 using Artemis.Core.Models.Surface;
 using Artemis.Core.Plugins.LayerBrush;
+using Artemis.Core.Plugins.LayerBrush.Abstract;
 using Artemis.Core.Services;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Storage.Entities.Profile;
diff --git a/src/Artemis.Core/Plugins/LayerBrush/BaseLayerBrush.cs b/src/Artemis.Core/Plugins/LayerBrush/Abstract/BaseLayerBrush.cs
similarity index 96%
rename from src/Artemis.Core/Plugins/LayerBrush/BaseLayerBrush.cs
rename to src/Artemis.Core/Plugins/LayerBrush/Abstract/BaseLayerBrush.cs
index 7c3c41514..01ee4e789 100644
--- a/src/Artemis.Core/Plugins/LayerBrush/BaseLayerBrush.cs
+++ b/src/Artemis.Core/Plugins/LayerBrush/Abstract/BaseLayerBrush.cs
@@ -1,13 +1,11 @@
 using System;
-using System.Linq;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Plugins.Models;
 using Artemis.Core.Services.Interfaces;
 using RGB.NET.Core;
-using RGB.NET.Groups;
 using SkiaSharp;
 
-namespace Artemis.Core.Plugins.LayerBrush
+namespace Artemis.Core.Plugins.LayerBrush.Abstract
 {
     /// <summary>
     ///     For internal use only, please use <see cref="LayerBrush{T}" /> or <see cref="RgbNetLayerBrush{T}" /> or instead
diff --git a/src/Artemis.Core/Plugins/LayerBrush/LayerBrush.cs b/src/Artemis.Core/Plugins/LayerBrush/Abstract/LayerBrush.cs
similarity index 97%
rename from src/Artemis.Core/Plugins/LayerBrush/LayerBrush.cs
rename to src/Artemis.Core/Plugins/LayerBrush/Abstract/LayerBrush.cs
index c2285a09a..60f694cc0 100644
--- a/src/Artemis.Core/Plugins/LayerBrush/LayerBrush.cs
+++ b/src/Artemis.Core/Plugins/LayerBrush/Abstract/LayerBrush.cs
@@ -4,7 +4,7 @@ using Artemis.Core.Services.Interfaces;
 using RGB.NET.Core;
 using SkiaSharp;
 
-namespace Artemis.Core.Plugins.LayerBrush
+namespace Artemis.Core.Plugins.LayerBrush.Abstract
 {
     public abstract class LayerBrush<T> : PropertiesLayerBrush<T> where T : LayerPropertyGroup
     {
diff --git a/src/Artemis.Core/Plugins/LayerBrush/PropertiesLayerBrush.cs b/src/Artemis.Core/Plugins/LayerBrush/Abstract/PropertiesLayerBrush.cs
similarity index 97%
rename from src/Artemis.Core/Plugins/LayerBrush/PropertiesLayerBrush.cs
rename to src/Artemis.Core/Plugins/LayerBrush/Abstract/PropertiesLayerBrush.cs
index ee7010c3c..4350184f4 100644
--- a/src/Artemis.Core/Plugins/LayerBrush/PropertiesLayerBrush.cs
+++ b/src/Artemis.Core/Plugins/LayerBrush/Abstract/PropertiesLayerBrush.cs
@@ -3,7 +3,7 @@ using Artemis.Core.Models.Profile;
 using Artemis.Core.Plugins.Exceptions;
 using Artemis.Core.Services.Interfaces;
 
-namespace Artemis.Core.Plugins.LayerBrush
+namespace Artemis.Core.Plugins.LayerBrush.Abstract
 {
     /// <summary>
     ///     For internal use only, please use <see cref="LayerBrush{T}" /> or <see cref="RgbNetLayerBrush{T}" /> or instead
diff --git a/src/Artemis.Core/Plugins/LayerBrush/RgbNetLayerBrush.cs b/src/Artemis.Core/Plugins/LayerBrush/Abstract/RgbNetLayerBrush.cs
similarity index 98%
rename from src/Artemis.Core/Plugins/LayerBrush/RgbNetLayerBrush.cs
rename to src/Artemis.Core/Plugins/LayerBrush/Abstract/RgbNetLayerBrush.cs
index 48c01a6f7..7337390c7 100644
--- a/src/Artemis.Core/Plugins/LayerBrush/RgbNetLayerBrush.cs
+++ b/src/Artemis.Core/Plugins/LayerBrush/Abstract/RgbNetLayerBrush.cs
@@ -6,7 +6,7 @@ using RGB.NET.Core;
 using RGB.NET.Groups;
 using SkiaSharp;
 
-namespace Artemis.Core.Plugins.LayerBrush
+namespace Artemis.Core.Plugins.LayerBrush.Abstract
 {
     public abstract class RgbNetLayerBrush<T> : PropertiesLayerBrush<T> where T : LayerPropertyGroup
     {
diff --git a/src/Artemis.Core/Plugins/LayerBrush/LayerBrushProvider.cs b/src/Artemis.Core/Plugins/LayerBrush/LayerBrushProvider.cs
index 53f505f7a..f86ac8bb0 100644
--- a/src/Artemis.Core/Plugins/LayerBrush/LayerBrushProvider.cs
+++ b/src/Artemis.Core/Plugins/LayerBrush/LayerBrushProvider.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using Artemis.Core.Plugins.Abstract;
+using Artemis.Core.Plugins.LayerBrush.Abstract;
 using Artemis.Core.Plugins.Models;
 
 namespace Artemis.Core.Plugins.LayerBrush
diff --git a/src/Artemis.Core/Services/Interfaces/ILayerService.cs b/src/Artemis.Core/Services/Interfaces/ILayerService.cs
index c59245532..6f2857ca6 100644
--- a/src/Artemis.Core/Services/Interfaces/ILayerService.cs
+++ b/src/Artemis.Core/Services/Interfaces/ILayerService.cs
@@ -1,5 +1,6 @@
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Plugins.LayerBrush;
+using Artemis.Core.Plugins.LayerBrush.Abstract;
 
 namespace Artemis.Core.Services.Interfaces
 {
diff --git a/src/Artemis.Core/Services/LayerService.cs b/src/Artemis.Core/Services/LayerService.cs
index 8dac3ed62..609ecdff6 100644
--- a/src/Artemis.Core/Services/LayerService.cs
+++ b/src/Artemis.Core/Services/LayerService.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using Artemis.Core.Exceptions;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Plugins.LayerBrush;
+using Artemis.Core.Plugins.LayerBrush.Abstract;
 using Artemis.Core.Services.Interfaces;
 using Ninject;
 using Ninject.Parameters;
diff --git a/src/Artemis.UI.Shared/Controls/DraggableFloat.xaml b/src/Artemis.UI.Shared/Controls/DraggableFloat.xaml
index 352ba72b4..c9c7dc315 100644
--- a/src/Artemis.UI.Shared/Controls/DraggableFloat.xaml
+++ b/src/Artemis.UI.Shared/Controls/DraggableFloat.xaml
@@ -21,12 +21,12 @@
                         <Rectangle x:Name="BorderVisual"
                                    StrokeDashArray="2 2" Stroke="{DynamicResource SecondaryAccentBrush}" StrokeThickness="1"
                                    Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualWidth}"
-                                   Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualHeight}">
-                        </Rectangle>
+                                   Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualHeight}" />
                     </VisualBrush.Visual>
                 </VisualBrush>
             </Border.BorderBrush>
-            <TextBlock Width="60"
+            <TextBlock Style="{x:Null}"
+                       Width="60"
                        Height="17"
                        Padding="1 0"
                        Margin="0 4 0 0"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs
index a5c7e79a7..034921e90 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs
+++ b/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs
@@ -10,6 +10,7 @@ using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.LayerProperties;
 using Artemis.Core.Models.Profile.LayerProperties.Attributes;
 using Artemis.Core.Plugins.LayerBrush;
+using Artemis.Core.Plugins.LayerBrush.Abstract;
 using Artemis.Core.Services;
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Events;
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileViewModel.cs
index b00e757e1..0cd4be0d6 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileViewModel.cs
+++ b/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileViewModel.cs
@@ -7,6 +7,7 @@ using Artemis.Core.Events;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Surface;
 using Artemis.Core.Plugins.LayerBrush;
+using Artemis.Core.Plugins.LayerBrush.Abstract;
 using Artemis.Core.Plugins.Models;
 using Artemis.Core.Services;
 using Artemis.Core.Services.Interfaces;
diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs
index f3f9685a3..e535ce6ae 100644
--- a/src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs
+++ b/src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs
@@ -1,6 +1,7 @@
 using System;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Plugins.LayerBrush;
+using Artemis.Core.Plugins.LayerBrush.Abstract;
 using SkiaSharp;
 
 namespace Artemis.Plugins.LayerBrushes.Color
@@ -72,7 +73,7 @@ namespace Artemis.Plugins.LayerBrushes.Color
                     SKShaderTileMode.Repeat),
                 GradientType.RadialGradient => SKShader.CreateRadialGradient(
                     center,
-                    Math.Min(_shaderBounds.Width, _shaderBounds.Height),
+                    Math.Max(_shaderBounds.Width, _shaderBounds.Height),
                     Properties.Gradient.BaseValue.GetColorsArray(),
                     Properties.Gradient.BaseValue.GetPositionsArray(),
                     SKShaderTileMode.Repeat),
diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrush.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrush.cs
index a9f88ca25..95f6360ac 100644
--- a/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrush.cs
+++ b/src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrush.cs
@@ -2,6 +2,7 @@
 using Artemis.Core.Extensions;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Plugins.LayerBrush;
+using Artemis.Core.Plugins.LayerBrush.Abstract;
 using RGB.NET.Brushes;
 using RGB.NET.Core;
 
diff --git a/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs
index 3b4633e22..f0fdcc03e 100644
--- a/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs
+++ b/src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Plugins.LayerBrush;
+using Artemis.Core.Plugins.LayerBrush.Abstract;
 using Artemis.Core.Services.Interfaces;
 using Artemis.Plugins.LayerBrushes.Noise.Utilities;
 using SkiaSharp;