From a783e52c41b14b3c382854bccd7cf1ae1e0f642a Mon Sep 17 00:00:00 2001 From: Darth Affe Date: Sun, 27 Mar 2016 17:57:13 +0200 Subject: [PATCH] Moved brush calculation mode to the brush This makes obviously more sense ... --- Brushes/AbstractBrush.cs | 6 ++++++ Brushes/IBrush.cs | 6 ++++++ Devices/Keyboard/CorsairKeyboard.cs | 7 +------ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Brushes/AbstractBrush.cs b/Brushes/AbstractBrush.cs index 5160433..649caba 100644 --- a/Brushes/AbstractBrush.cs +++ b/Brushes/AbstractBrush.cs @@ -1,6 +1,7 @@ // ReSharper disable VirtualMemberNeverOverriden.Global using System.Drawing; +using CUE.NET.Devices.Keyboard.Enums; using CUE.NET.Helper; namespace CUE.NET.Brushes @@ -12,6 +13,11 @@ namespace CUE.NET.Brushes { #region Properties & Fields + /// + /// Gets or sets the calculation mode used for the rectangle/points used for color-selection in brushes. + /// + public BrushCalculationMode BrushCalculationMode { get; set; } = BrushCalculationMode.Relative; + /// /// Gets or sets the overall percentage brightness of the brush. /// diff --git a/Brushes/IBrush.cs b/Brushes/IBrush.cs index 54558af..bcb1099 100644 --- a/Brushes/IBrush.cs +++ b/Brushes/IBrush.cs @@ -1,6 +1,7 @@ // ReSharper disable UnusedMemberInSuper.Global using System.Drawing; +using CUE.NET.Devices.Keyboard.Enums; namespace CUE.NET.Brushes { @@ -9,6 +10,11 @@ namespace CUE.NET.Brushes /// public interface IBrush { + /// + /// Gets or sets the calculation mode used for the rectangle/points used for color-selection in brushes. + /// + BrushCalculationMode BrushCalculationMode { get; set; } + /// /// Gets or sets the overall percentage brightness of the brush. /// diff --git a/Devices/Keyboard/CorsairKeyboard.cs b/Devices/Keyboard/CorsairKeyboard.cs index 4f9d7f7..d0cc226 100644 --- a/Devices/Keyboard/CorsairKeyboard.cs +++ b/Devices/Keyboard/CorsairKeyboard.cs @@ -106,11 +106,6 @@ namespace CUE.NET.Devices.Keyboard /// public int ZIndex { get; set; } = 0; - /// - /// Gets or sets the calculation mode used for the rectangle/points used for color-selection in brushes. - /// - public BrushCalculationMode BrushCalculationMode { get; set; } = BrushCalculationMode.Relative; - /// /// Gets a value indicating if the keyboard has an active effect to deal with or not. /// @@ -175,7 +170,7 @@ namespace CUE.NET.Devices.Keyboard { try { - switch (BrushCalculationMode) + switch (brush.BrushCalculationMode) { case BrushCalculationMode.Relative: RectangleF brushRectangle = RectangleHelper.CreateRectangleFromRectangles(keys.Select(x => x.KeyRectangle));