Bug fixes for Shortcut Assistant Layer

Signed-off-by: Alex <[email protected]>
antonpup · Apr 3, 2020 · 0200530 · 0200530
1 parent b6a5c40
commit 0200530
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/Project-Aurora/Project-Aurora/Settings/Layers/ShortcutAssistantLayerHandler.cs b/Project-Aurora/Project-Aurora/Settings/Layers/ShortcutAssistantLayerHandler.cs
@@ -107,7 +107,7 @@ public override void Default()
             _DimBackground = true;
             _DimColor = Color.FromArgb(169, 0, 0, 0);
             _PresentationType = ShortcutAssistantPresentationType.Default;
-            _MergeModifierKey = true;
+            _MergeModifierKey = false;
         }
     }
 
@@ -129,8 +129,6 @@ public override EffectLayer Render(IGameState gamestate)
 
             Keys[] heldKeys = Global.InputEvents.PressedKeys;
 
-
-
             Tree<Keys> _childKeys = Properties.ShortcutKeysTree;
             foreach (var key in heldKeys)
             {
@@ -149,11 +147,19 @@ public override EffectLayer Render(IGameState gamestate)
 
                 if(shortcutKeys.Length > 0)
                 {
+
+                    Devices.DeviceKeys[] selectedKeys = Utils.KeyUtils.GetDeviceKeys(shortcutKeys, true, !Console.NumberLock)
+                        .Concat(Utils.KeyUtils.GetDeviceKeys(heldKeys, true)).ToArray();
+
                     if (Properties.DimBackground)
-                        sc_assistant_layer.Fill(Properties.DimColor);
+                    {
+                        Devices.DeviceKeys[] backgroundKeys = Utils.KeyUtils.GetDeviceAllKeys().Except(selectedKeys).ToArray();
+                        sc_assistant_layer.Set(backgroundKeys, Properties.DimColor);
+                        //sc_assistant_layer.Fill(Properties.DimColor);
+                    }
 
-                    sc_assistant_layer.Set(Utils.KeyUtils.GetDeviceKeys(shortcutKeys, true, !Console.NumberLock), Properties.PrimaryColor);
-                    sc_assistant_layer.Set(Utils.KeyUtils.GetDeviceKeys(heldKeys, true), Properties.PrimaryColor);
+                    sc_assistant_layer.Set(selectedKeys, Properties.PrimaryColor);
+
                 }
             }
 

diff --git a/Project-Aurora/Project-Aurora/Utils/KeyUtils.cs b/Project-Aurora/Project-Aurora/Utils/KeyUtils.cs
@@ -898,6 +898,11 @@ public static DeviceKeys[] GetDeviceKeys(Keys[] formsKeys, bool extendedKeys = f
             return _returnKeys.ToArray();
         }
 
+        public static DeviceKeys[] GetDeviceAllKeys()
+        {
+            return (DeviceKeys[])Enum.GetValues(typeof(DeviceKeys));
+        }
+
         /// <summary>
         /// Converts CorsairLedId to Devices.DeviceKeys
         /// </summary>
@@ -1193,8 +1198,6 @@ public static Keys GetStandardKey(Keys key)
             {
                 case Keys.RControlKey:
                     return Keys.LControlKey;
-                case Keys.RMenu:
-                    return Keys.LMenu;
                 case Keys.RShiftKey:
                     return Keys.LShiftKey;
                 case Keys.RWin: