mirror of
https://github.com/Artemis-RGB/Artemis
synced 2026-11-12 03:48:56 +00:00
Devices - Added keyboard layout selection logic
UI - Improved plugin settings tab performance, added search text highlighting
This commit is contained in:
1 parent
46d3a288e9
commit
b209bfd833
13 files changed
+308
-88
No files matched your search
@@ -353,7 +353,7 @@ namespace Artemis.Core
|
||||
{
|
||||
RgbDevice.Rotation = DeviceEntity.Rotation;
|
||||
RgbDevice.Scale = DeviceEntity.Scale;
|
||||
|
||||
|
||||
// Workaround for device rotation not applying
|
||||
if (DeviceEntity.X == 0 && DeviceEntity.Y == 0)
|
||||
RgbDevice.Location = new Point(1, 1);
|
||||
@@ -391,12 +391,16 @@ namespace Artemis.Core
|
||||
if (RgbDevice.DeviceInfo.DeviceType != RGBDeviceType.Keyboard)
|
||||
return;
|
||||
|
||||
IKeyboard keyboard = (IKeyboard) RgbDevice;
|
||||
IKeyboard? keyboard = RgbDevice as IKeyboard;
|
||||
// If supported, detect the device layout so that we can load the correct one
|
||||
if (DeviceProvider.CanDetectLogicalLayout)
|
||||
LogicalLayout = DeviceProvider.GetLogicalLayout(keyboard);
|
||||
if (DeviceProvider.CanDetectPhysicalLayout)
|
||||
if (DeviceProvider.CanDetectPhysicalLayout && keyboard != null)
|
||||
PhysicalLayout = (KeyboardLayoutType) keyboard.DeviceInfo.Layout;
|
||||
else
|
||||
PhysicalLayout = (KeyboardLayoutType) DeviceEntity.PhysicalLayout;
|
||||
if (DeviceProvider.CanDetectLogicalLayout && keyboard != null)
|
||||
LogicalLayout = DeviceProvider.GetLogicalLayout(keyboard);
|
||||
else
|
||||
LogicalLayout = DeviceEntity.LogicalLayout;
|
||||
}
|
||||
|
||||
#region Events
|
||||
|
||||
Reference in new issue
Block a user