fix solid fill layer

reduce LoadDefaultDevice calls at startup

Author: Aytackydln

Project-Aurora/ColorBox/ColorBox.csproj

@@ -41,4 +41,13 @@
     <Content Include="LICENSE.txt" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Lombok.NET">
+      <Version>1.2.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.Common">
+      <Version>4.1.0</Version>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>

Project-Aurora/Plugin-Example/Plugin-Example.csproj

@@ -25,6 +25,12 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.Common">
+      <Version>4.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp">
+      <Version>4.1.0</Version>
+    </PackageReference>
     <PackageReference Include="Xceed.Wpf.Toolkit">
       <Version>2.9.15603.14400</Version>
     </PackageReference>

Project-Aurora/Project-Aurora/EffectsEngine/EffectLayer.cs

@@ -24,7 +24,7 @@ public class EffectLayer : IDisposable
         private float _opacity = 1;
 
         private TextureBrush _textureBrush;
-        private bool _needsRender;
+        private bool _needsRender = true;
 
         internal Rectangle Dimension;
 

Project-Aurora/Project-Aurora/EffectsEngine/Effects.cs

@@ -177,7 +177,7 @@ public class Effects
 
         // ReSharper disable once EventNeverSubscribedTo.Global
         public static event EventHandler<CanvasChangedArgs> CanvasChanged;
-        public static object CanvasChangedLock = new();
+        public static readonly object CanvasChangedLock = new();
 
         private static int _canvasWidth = 1;
         public static int CanvasWidth
@@ -227,7 +227,7 @@ private set
         private readonly Dictionary<DeviceKeys, Color> _keyColors = new(MaxDeviceId, EnumHashGetter.Instance as IEqualityComparer<DeviceKeys>);
 
         private readonly Lazy<EffectLayer> _effectLayerFactory = new(() => new EffectLayer("Global Background", Color.Black));
-        private EffectLayer _background => _effectLayerFactory.Value;
+        private EffectLayer Background => _effectLayerFactory.Value;
 
         public Effects()
         {
@@ -267,51 +267,51 @@ public void SetBitmapping(Dictionary<DeviceKeys, BitmapRectangle> bitmap_map)
         private readonly SolidBrush _blackBrush = new(Color.Black);
         public void PushFrame(EffectFrame frame)
         {
-            _background.Fill(_blackBrush);
+            Background.Fill(_blackBrush);
 
             var overLayersArray = frame.GetOverlayLayers();
             var layersArray = frame.GetLayers();
 
             foreach (var layer in layersArray)
-                _background.Add(layer);
+                Background.Add(layer);
             foreach (var layer in overLayersArray)
-                _background.Add(layer);
+                Background.Add(layer);
 
             //Apply Brightness
             foreach (var key in PossiblePeripheralKeys)
             {
-                _peripheralColors[key] = _background.Get(key);
+                _peripheralColors[key] = Background.Get(key);
             }
 
             var keyboardDarkness = 1.0f - Global.Configuration.KeyboardBrightness * Global.Configuration.GlobalBrightness;
             _keyboardDarknessBrush.Color = Color.FromArgb((int) (255.0f * keyboardDarkness), Color.Black);
-            _background.FillOver(_keyboardDarknessBrush);
+            Background.FillOver(_keyboardDarknessBrush);
 
             var peripheralDarkness = 1.0f - Global.Configuration.PeripheralBrightness * Global.Configuration.GlobalBrightness;
-            lock (_background.GetBitmap())
+            lock (Background.GetBitmap())
                 foreach (var key in PossiblePeripheralKeys)
-                    _background.Set(key, Utils.ColorUtils.BlendColors(_peripheralColors[key], Color.Black, peripheralDarkness));
+                    Background.Set(key, Utils.ColorUtils.BlendColors(_peripheralColors[key], Color.Black, peripheralDarkness));
 
 
             if (_forcedFrame != null)
             {
-                using var g = _background.GetGraphics();
+                using var g = Background.GetGraphics();
                 g.Clear(Color.Black);
                 g.DrawImage(_forcedFrame, 0, 0, CanvasWidth, CanvasHeight);
             }
 
             var allKeys = _bitmapMap.Keys.ToArray();
 
             foreach (var key in allKeys)
-                _keyColors[key] = _background.Get(key);
+                _keyColors[key] = Background.Get(key);
 
             var dcc = new DeviceColorComposition
             {
                 KeyColors = _keyColors,
             };
             Global.dev_manager.UpdateDevices(dcc);
 
-            NewLayerRender?.Invoke(_background.GetBitmap());
+            NewLayerRender?.Invoke(Background.GetBitmap());
 
             frame.Dispose();
         }

Project-Aurora/Project-Aurora/Project-Aurora.csproj

@@ -80,6 +80,9 @@
     <PackageReference Include="IronPython" Version="2.7.12" />
     <PackageReference Include="JsonSubTypes" Version="1.9.0" />
     <PackageReference Include="LibreHardwareMonitorLib" Version="0.9.0" />
+    <PackageReference Include="Lombok.NET" Version="1.2.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
     <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
     <PackageReference Include="MouseKeyHook" Version="5.6.0" />
     <PackageReference Include="NAudio" Version="2.1.0" />

Project-Aurora/Project-Aurora/Settings/Control_Settings.xaml.cs

@@ -32,10 +32,12 @@ public partial class Control_Settings
     {
         private readonly RegistryKey _runRegistryPath = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
         private const string StartupTaskId = "AuroraStartup";
+        private readonly bool _componentsInitialized;
 
         public Control_Settings()
         {
             InitializeComponent();
+            _componentsInitialized = true;
 
             tabMain.DataContext = Global.Configuration;
 
@@ -202,7 +204,14 @@ private void updates_check_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void LoadBrandDefault(object sender, SelectionChangedEventArgs e) => Global.kbLayout.LoadBrandDefault();
+        private void LoadBrandDefault(object sender, SelectionChangedEventArgs e)
+        {
+            if (_componentsInitialized)
+            {
+                Global.kbLayout.LoadBrandDefault();
+            }
+        }
+
         private async void ResetDevices(object sender, RoutedEventArgs e) => await Global.dev_manager.ResetDevices();
 
         private void razer_wrapper_install_button_Click(object sender, RoutedEventArgs e)

Project-Aurora/Project-Aurora/Settings/Layers/LayerHandler.cs

@@ -7,6 +7,7 @@
 using System.Windows.Controls;
 using FastMember;
 using System.ComponentModel;
+using System.Runtime.Serialization;
 using System.Windows;
 using Windows.Foundation.Metadata;
 using Application = Aurora.Profiles.Application;
@@ -129,6 +130,12 @@ public void SetOverride(string propertyName, object value) {
             } catch (ArgumentOutOfRangeException) { }
         }
 
+        [OnDeserialized]
+        public void OnDeserialized(StreamingContext context)
+        {
+            OnPropertiesChanged(this, new PropertyChangedEventArgs(""));
+        }
+
         public void OnPropertiesChanged(object sender, object args = null)
         {
             PropertyChanged?.Invoke(sender, new PropertyChangedEventArgs(""));
@@ -266,9 +273,21 @@ public float? _Opacity {
         private EffectLayer _previousSecondRender = EffectLayer.EmptyLayer; //Layer before previous
 
         [JsonIgnore]
-        private Lazy<EffectLayer> _effectLayer;
+        private readonly Lazy<EffectLayer> _effectLayer;
 
-        protected EffectLayer EffectLayer => _effectLayer.Value;
+        protected static PropertyChangedEventArgs ConstPropertyChangedEventArgs = new("");
+        protected EffectLayer EffectLayer
+        {
+            get
+            {
+                if (!_effectLayer.IsValueCreated)
+                {
+                    var _ = _effectLayer.Value;
+                    PropertiesChanged(this, ConstPropertyChangedEventArgs);
+                }
+                return _effectLayer.Value;
+            }
+        }
 
         protected LayerHandler(): this("Unoptimized Layer"){}
 
@@ -329,6 +348,12 @@ protected virtual UserControl CreateControl()
         {
             return new Control_DefaultLayer();
         }
+
+        [OnDeserialized]
+        public void OnDeserialized(StreamingContext context)
+        {
+            PropertiesChanged(this, new PropertyChangedEventArgs(""));
+        }
 
         protected virtual void PropertiesChanged(object sender, PropertyChangedEventArgs args)
         {
@@ -337,12 +362,12 @@ protected virtual void PropertiesChanged(object sender, PropertyChangedEventArgs
 
         private void PropertiesChanged(object sender, CanvasChangedArgs e)
         {
-            PropertiesChanged(sender, new PropertyChangedEventArgs(""));
+            PropertiesChanged(sender, ConstPropertyChangedEventArgs);
         }
 
         private void PropertiesChanged(object sender, FreeFormChangedArgs e)
         {
-            PropertiesChanged(sender, new PropertyChangedEventArgs(""));
+            PropertiesChanged(sender, ConstPropertyChangedEventArgs);
         }
 
         public virtual void Dispose()

Project-Aurora/Project-Aurora/Settings/Layers/SolidFillLayerHandler.cs

@@ -3,16 +3,13 @@
 using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Controls;
+using Lombok.NET;
 
 namespace Aurora.Settings.Layers
 {
-    public class SolidFillLayerHandlerProperties : LayerHandlerProperties<SolidFillLayerHandlerProperties>
+    [NoArgsConstructor]
+    public partial class SolidFillLayerHandlerProperties : LayerHandlerProperties<SolidFillLayerHandlerProperties>
     {
-        public SolidFillLayerHandlerProperties() : base()
-        {
-
-        }
-
         public SolidFillLayerHandlerProperties(bool arg = false) : base(arg)
         {
 
@@ -29,7 +26,6 @@ public override void Default()
     public class SolidFillLayerHandler : LayerHandler<SolidFillLayerHandlerProperties>
     {
         private readonly SolidBrush _solidBrush = new(Color.Transparent);
-        private bool _needsUpdate = true;
 
         public SolidFillLayerHandler() : base("Solid Fill Layer")
         {
@@ -50,7 +46,6 @@ protected override void PropertiesChanged(object sender, PropertyChangedEventArg
             base.PropertiesChanged(sender, args);
             _solidBrush.Color = Properties.PrimaryColor;
             EffectLayer.Fill(_solidBrush);
-            EffectLayer.Invalidate();
         }
     }
 }