From de3d793b407e9a01089e51fe477b8cf721d27bd2 Mon Sep 17 00:00:00 2001
From: Gergely Nagy <algernon@madhouse-project.org>
Date: Wed, 9 Aug 2017 11:01:49 +0200
Subject: [PATCH] Move the modifier activity check into `isModifierActive`

This way, the body of the loop in `loopHook` becomes even simpler.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
---
 src/Kaleidoscope/LED-ActiveModColor.cpp | 6 +++---
 src/Kaleidoscope/LED-ActiveModColor.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Kaleidoscope/LED-ActiveModColor.cpp b/src/Kaleidoscope/LED-ActiveModColor.cpp
index 0d6380c2..15e20303 100644
--- a/src/Kaleidoscope/LED-ActiveModColor.cpp
+++ b/src/Kaleidoscope/LED-ActiveModColor.cpp
@@ -33,7 +33,7 @@ void ActiveModColorEffect::begin(void) {
   loop_hook_use(loopHook);
 }
 
-bool ActiveModColorEffect::isModifier(Key key) {
+bool ActiveModColorEffect::isModifierActive(Key key) {
   if (key.raw >= ranges::OSM_FIRST && key.raw <= ranges::OSM_LAST) {
     uint8_t idx = key.raw - ranges::OSM_FIRST;
     key.flags = 0;
@@ -43,7 +43,7 @@ bool ActiveModColorEffect::isModifier(Key key) {
   if (key.raw < Key_LeftControl.raw || key.raw > Key_RightGui.raw)
     return false;
 
-  return true;
+  return hid::isModifierKeyActive(key);
 }
 
 void ActiveModColorEffect::loopHook(bool is_post_clear) {
@@ -54,7 +54,7 @@ void ActiveModColorEffect::loopHook(bool is_post_clear) {
     for (byte c = 0; c < COLS; c++) {
       Key k = Layer.lookup(r, c);
 
-      if (isModifier(k) && hid::isModifierKeyActive(k))
+      if (isModifierActive(k))
         LEDControl.setCrgbAt(r, c, highlight_color);
     }
   }
diff --git a/src/Kaleidoscope/LED-ActiveModColor.h b/src/Kaleidoscope/LED-ActiveModColor.h
index 6151e3a9..e63f3025 100644
--- a/src/Kaleidoscope/LED-ActiveModColor.h
+++ b/src/Kaleidoscope/LED-ActiveModColor.h
@@ -31,7 +31,7 @@ class ActiveModColorEffect : public KaleidoscopePlugin {
   static cRGB highlight_color;
 
  private:
-  static bool isModifier(Key key);
+  static bool isModifierActive(Key key);
   static void loopHook(bool is_post_clear);
 };
 }