DarthAffe/RGB.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/RGB.NET.git synced 2025-12-13 10:08:31 +00:00
Code Issues Releases Wiki Activity

Renamed mousemat to mousepad

Browse Source
This commit is contained in:
Darth Affe 2017-08-13 08:33:53 +02:00
parent cc40f3b75b
commit 15598ab975
12 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RGB.NET.Core/Devices/RGBDeviceType.cs
View File

@ -26,9 +26,9 @@
Headset = 3, Headset = 3,
/// <summary> /// <summary>
/// Represents a mousmat. /// Represents a mousepad.
/// </summary> /// </summary>
Mousemat = 4, Mousepad = 4,
/// <summary> /// <summary>
/// Represents a LED-stipe. /// Represents a LED-stipe.

2
RGB.NET.Core/Positioning/Rectangle.cs
View File

@ -192,7 +192,7 @@ namespace RGB.NET.Core
if (IsEmpty || intersectingRect.IsEmpty) return 0; if (IsEmpty || intersectingRect.IsEmpty) return 0;
Rectangle intersection = CalculateIntersection(intersectingRect); Rectangle intersection = CalculateIntersection(intersectingRect);
return intersection.IsEmpty ? 0 : (intersection.Size.Width * intersection.Size.Height) / (Size.Width * Size.Height); return (intersection.Size.Width * intersection.Size.Height) / (Size.Width * Size.Height);
} }
/// <summary> /// <summary>

2
RGB.NET.Devices.CoolerMaster/Generic/CoolerMasterRGBDevice.cs
View File

@ -9,7 +9,7 @@ using RGB.NET.Devices.CoolerMaster.Native;
namespace RGB.NET.Devices.CoolerMaster namespace RGB.NET.Devices.CoolerMaster
{ {
/// <summary> /// <summary>
/// Represents a generic CoolerMaster-device. (keyboard, mouse, headset, mousmat). /// Represents a generic CoolerMaster-device. (keyboard, mouse, headset, mousepad).
/// </summary> /// </summary>
public abstract class CoolerMasterRGBDevice : AbstractRGBDevice public abstract class CoolerMasterRGBDevice : AbstractRGBDevice
{ {

4
RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs
View File

@ -161,8 +161,8 @@ namespace RGB.NET.Devices.Corsair
case CorsairDeviceType.Headset: case CorsairDeviceType.Headset:
device = new CorsairHeadsetRGBDevice(new CorsairHeadsetRGBDeviceInfo(i, nativeDeviceInfo)); device = new CorsairHeadsetRGBDevice(new CorsairHeadsetRGBDeviceInfo(i, nativeDeviceInfo));
break; break;
case CorsairDeviceType.Mousemat: case CorsairDeviceType.Mousepad:
device = new CorsairMousematRGBDevice(new CorsairMousematRGBDeviceInfo(i, nativeDeviceInfo)); device = new CorsairMousepadRGBDevice(new CorsairMousepadRGBDeviceInfo(i, nativeDeviceInfo));
break; break;
// ReSharper disable once RedundantCaseLabel // ReSharper disable once RedundantCaseLabel
case CorsairDeviceType.Unknown: case CorsairDeviceType.Unknown:

2
RGB.NET.Devices.Corsair/Enum/CorsairDeviceType.cs
View File

@ -15,6 +15,6 @@ namespace RGB.NET.Devices.Corsair
Mouse = 1, Mouse = 1,
Keyboard = 2, Keyboard = 2,
Headset = 3, Headset = 3,
Mousemat = 4 Mousepad = 4
}; };
} }

2
RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs
View File

@ -10,7 +10,7 @@ using RGB.NET.Devices.Corsair.Native;
namespace RGB.NET.Devices.Corsair namespace RGB.NET.Devices.Corsair
{ {
/// <summary> /// <summary>
/// Represents a generic CUE-device. (keyboard, mouse, headset, mousmat). /// Represents a generic CUE-device. (keyboard, mouse, headset, mousepad).
/// </summary> /// </summary>
public abstract class CorsairRGBDevice : AbstractRGBDevice public abstract class CorsairRGBDevice : AbstractRGBDevice
{ {

22
RGB.NET.Devices.Corsair/Mousmat/CorsairMousematRGBDevice.cs → RGB.NET.Devices.Corsair/Mousepad/CorsairMousepadRGBDevice.cs
View File

@ -11,29 +11,29 @@ using RGB.NET.Devices.Corsair.Native;
namespace RGB.NET.Devices.Corsair namespace RGB.NET.Devices.Corsair
{ {
/// <summary> /// <summary>
/// Represents a corsair mousemat. /// Represents a corsair mousepad.
/// </summary> /// </summary>
public class CorsairMousematRGBDevice : CorsairRGBDevice public class CorsairMousepadRGBDevice : CorsairRGBDevice
{ {
#region Properties & Fields #region Properties & Fields
/// <summary> /// <summary>
/// Gets information about the <see cref="CorsairMousematRGBDevice"/>. /// Gets information about the <see cref="CorsairMousepadRGBDevice"/>.
/// </summary> /// </summary>
public CorsairMousematRGBDeviceInfo MousematDeviceInfo { get; } public CorsairMousepadRGBDeviceInfo MousepadDeviceInfo { get; }
#endregion #endregion
#region Constructors #region Constructors
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="CorsairMousematRGBDevice"/> class. /// Initializes a new instance of the <see cref="CorsairMousepadRGBDevice"/> class.
/// </summary> /// </summary>
/// <param name="info">The specific information provided by CUE for the mousemat</param> /// <param name="info">The specific information provided by CUE for the mousepad</param>
internal CorsairMousematRGBDevice(CorsairMousematRGBDeviceInfo info) internal CorsairMousepadRGBDevice(CorsairMousepadRGBDeviceInfo info)
: base(info) : base(info)
{ {
this.MousematDeviceInfo = info; this.MousepadDeviceInfo = info;
} }
#endregion #endregion
@ -45,7 +45,7 @@ namespace RGB.NET.Devices.Corsair
{ {
_CorsairLedPositions nativeLedPositions = _CorsairLedPositions nativeLedPositions =
(_CorsairLedPositions) (_CorsairLedPositions)
Marshal.PtrToStructure(_CUESDK.CorsairGetLedPositionsByDeviceIndex(MousematDeviceInfo.CorsairDeviceIndex), Marshal.PtrToStructure(_CUESDK.CorsairGetLedPositionsByDeviceIndex(MousepadDeviceInfo.CorsairDeviceIndex),
typeof(_CorsairLedPositions)); typeof(_CorsairLedPositions));
int structSize = Marshal.SizeOf(typeof(_CorsairLedPosition)); int structSize = Marshal.SizeOf(typeof(_CorsairLedPosition));
@ -63,8 +63,8 @@ namespace RGB.NET.Devices.Corsair
InitializeLed(new CorsairLedId(this, ledPosition.ledId), InitializeLed(new CorsairLedId(this, ledPosition.ledId),
new Rectangle(ledPosition.left, ledPosition.top, ledPosition.width, ledPosition.height)); new Rectangle(ledPosition.left, ledPosition.top, ledPosition.width, ledPosition.height));
ApplyLayoutFromFile(PathHelper.GetAbsolutePath($@"Layouts\Corsair\Mousemats\{MousematDeviceInfo.Model.Replace(" ", string.Empty).ToUpper()}.xml"), ApplyLayoutFromFile(PathHelper.GetAbsolutePath($@"Layouts\Corsair\Mousepads\{MousepadDeviceInfo.Model.Replace(" ", string.Empty).ToUpper()}.xml"),
null, PathHelper.GetAbsolutePath(@"Images\Corsair\Mousemats")); null, PathHelper.GetAbsolutePath(@"Images\Corsair\Mousepads"));
} }
#endregion #endregion

14
RGB.NET.Devices.Corsair/Mousmat/CorsairMousematRGBDeviceInfo.cs → RGB.NET.Devices.Corsair/Mousepad/CorsairMousepadRGBDeviceInfo.cs
View File

@ -5,21 +5,21 @@ using RGB.NET.Devices.Corsair.Native;
namespace RGB.NET.Devices.Corsair namespace RGB.NET.Devices.Corsair
{ {
/// <summary> /// <summary>
/// Represents a generic information for a <see cref="CorsairMousematRGBDevice"/>. /// Represents a generic information for a <see cref="CorsairMousepadRGBDevice"/>.
/// </summary> /// </summary>
public class CorsairMousematRGBDeviceInfo : CorsairRGBDeviceInfo public class CorsairMousepadRGBDeviceInfo : CorsairRGBDeviceInfo
{ {
#region Constructors #region Constructors
/// <summary> /// <summary>
/// Internal constructor of managed <see cref="CorsairMousematRGBDeviceInfo"/>. /// Internal constructor of managed <see cref="CorsairMousepadRGBDeviceInfo"/>.
/// </summary> /// </summary>
/// <param name="deviceIndex">The index if the <see cref="CorsairMousematRGBDevice"/>.</param> /// <param name="deviceIndex">The index if the <see cref="CorsairMousepadRGBDevice"/>.</param>
/// <param name="nativeInfo">The native <see cref="_CorsairDeviceInfo" />-struct</param> /// <param name="nativeInfo">The native <see cref="_CorsairDeviceInfo" />-struct</param>
internal CorsairMousematRGBDeviceInfo(int deviceIndex, _CorsairDeviceInfo nativeInfo) internal CorsairMousepadRGBDeviceInfo(int deviceIndex, _CorsairDeviceInfo nativeInfo)
: base(deviceIndex, RGBDeviceType.Mousemat, nativeInfo) : base(deviceIndex, RGBDeviceType.Mousepad, nativeInfo)
{ {
Image = new Uri(PathHelper.GetAbsolutePath($@"Images\Corsair\Mousemat\{Model.Replace(" ", string.Empty).ToUpper()}.png"), UriKind.Absolute); Image = new Uri(PathHelper.GetAbsolutePath($@"Images\Corsair\Mousepad\{Model.Replace(" ", string.Empty).ToUpper()}.png"), UriKind.Absolute);
} }
#endregion #endregion

2
RGB.NET.Devices.Corsair/Native/_CUESDK.cs
View File

@ -160,7 +160,7 @@ namespace RGB.NET.Devices.Corsair.Native
} }
/// <summary> /// <summary>
/// CUE-SDK: provides list of keyboard or mousemat LEDs with their physical positions. /// CUE-SDK: provides list of keyboard or mousepad LEDs with their physical positions.
/// </summary> /// </summary>
internal static IntPtr CorsairGetLedPositionsByDeviceIndex(int deviceIndex) internal static IntPtr CorsairGetLedPositionsByDeviceIndex(int deviceIndex)
{ {

8
RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj
View File

@ -65,8 +65,8 @@
<Compile Include="Keyboard\CorsairKeyboardRGBDeviceInfo.cs" /> <Compile Include="Keyboard\CorsairKeyboardRGBDeviceInfo.cs" />
<Compile Include="Mouse\CorsairMouseRGBDevice.cs" /> <Compile Include="Mouse\CorsairMouseRGBDevice.cs" />
<Compile Include="Mouse\CorsairMouseRGBDeviceInfo.cs" /> <Compile Include="Mouse\CorsairMouseRGBDeviceInfo.cs" />
<Compile Include="Mousmat\CorsairMousematRGBDevice.cs" /> <Compile Include="Mousepad\CorsairMousepadRGBDevice.cs" />
<Compile Include="Mousmat\CorsairMousematRGBDeviceInfo.cs" /> <Compile Include="Mousepad\CorsairMousepadRGBDeviceInfo.cs" />
<Compile Include="Native\_CorsairDeviceInfo.cs" /> <Compile Include="Native\_CorsairDeviceInfo.cs" />
<Compile Include="Native\_CorsairLedColor.cs" /> <Compile Include="Native\_CorsairLedColor.cs" />
<Compile Include="Native\_CorsairLedPosition.cs" /> <Compile Include="Native\_CorsairLedPosition.cs" />
@ -89,10 +89,10 @@
<ItemGroup> <ItemGroup>
<Folder Include="Images\Corsair\Headsets\" /> <Folder Include="Images\Corsair\Headsets\" />
<Folder Include="Images\Corsair\Mice\" /> <Folder Include="Images\Corsair\Mice\" />
<Folder Include="Images\Corsair\Mousemats\" /> <Folder Include="Images\Corsair\Mousepads\" />
<Folder Include="Layouts\Corsair\Headsets\" /> <Folder Include="Layouts\Corsair\Headsets\" />
<Folder Include="Layouts\Corsair\Mice\" /> <Folder Include="Layouts\Corsair\Mice\" />
<Folder Include="Layouts\Corsair\Mousemats\" /> <Folder Include="Layouts\Corsair\Mousepads\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Images\Corsair\Keyboards\K70RGB.png" /> <Content Include="Images\Corsair\Keyboards\K70RGB.png" />

1
RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj.DotSettings
View File

@ -1,5 +1,6 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=libs/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=libs/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=mousepad/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=native/@EntryIndexedValue">False</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=native/@EntryIndexedValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=mousmat/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=mousmat/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=mouse/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=mouse/@EntryIndexedValue">True</s:Boolean>

2
RGB.NET.Devices.Logitech/Generic/LogitechRGBDevice.cs
View File

@ -9,7 +9,7 @@ using RGB.NET.Devices.Logitech.Native;
namespace RGB.NET.Devices.Logitech namespace RGB.NET.Devices.Logitech
{ {
/// <summary> /// <summary>
/// Represents a generic Logitech-device. (keyboard, mouse, headset, mousmat). /// Represents a generic Logitech-device. (keyboard, mouse, headset, mousepad).
/// </summary> /// </summary>
public abstract class LogitechRGBDevice : AbstractRGBDevice public abstract class LogitechRGBDevice : AbstractRGBDevice
{ {