From c427023b31f544771391b4cd22d797ee14cadac3 Mon Sep 17 00:00:00 2001
From: XScorpion2 <rcalt2vt@gmail.com>
Date: Tue, 17 Sep 2019 12:28:02 -0500
Subject: [PATCH] [Keymap][Xulkal] User code update (#6752)

* Updating rgb menu behavior

* Fixing toggle keycode to work how I want it

* Enabling auto scroll timeout
---
 users/xulkal/config.h          |  4 ++++
 users/xulkal/custom_rgb.c      | 20 ++++++++++----------
 users/xulkal/process_records.c |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/users/xulkal/config.h b/users/xulkal/config.h
index c794530d456..4b05ea4ec4d 100644
--- a/users/xulkal/config.h
+++ b/users/xulkal/config.h
@@ -28,3 +28,7 @@
 #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
 #define DISABLE_RGB_MATRIX_SPLASH
 #define DISABLE_RGB_MATRIX_SOLID_SPLASH
+
+// 20m timeout (20m * 60s * 1000mil)
+#define RGB_DISABLE_TIMEOUT 1200000
+#define OLED_SCROLL_TIMEOUT 20000
diff --git a/users/xulkal/custom_rgb.c b/users/xulkal/custom_rgb.c
index 11bfad1d7a3..f68a7c56c08 100644
--- a/users/xulkal/custom_rgb.c
+++ b/users/xulkal/custom_rgb.c
@@ -10,17 +10,17 @@ void rgb_matrix_increase_flags(void)
             }
             break;
         case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
-                rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                rgb_matrix_set_color_all(0, 0, 0);
+                rgb_matrix_set_flags(LED_FLAG_NONE);
+                rgb_matrix_disable_noeeprom();
             }
             break;
         case LED_FLAG_UNDERGLOW: {
-                rgb_matrix_set_flags(LED_FLAG_NONE);
-                rgb_matrix_disable_noeeprom();
+                rgb_matrix_set_flags(LED_FLAG_ALL);
+                rgb_matrix_set_color_all(0, 0, 0);
             }
             break;
         default: {
-                rgb_matrix_set_flags(LED_FLAG_ALL);
+                rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
                 rgb_matrix_enable_noeeprom();
             }
             break;
@@ -31,8 +31,8 @@ void rgb_matrix_decrease_flags(void)
 {
     switch (rgb_matrix_get_flags()) {
         case LED_FLAG_ALL: {
-                rgb_matrix_set_flags(LED_FLAG_NONE);
-                rgb_matrix_disable_noeeprom();
+                rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                rgb_matrix_set_color_all(0, 0, 0);
             }
             break;
         case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
@@ -41,12 +41,12 @@ void rgb_matrix_decrease_flags(void)
             }
             break;
         case LED_FLAG_UNDERGLOW: {
-                rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
-                rgb_matrix_set_color_all(0, 0, 0);
+                rgb_matrix_set_flags(LED_FLAG_NONE);
+                rgb_matrix_disable_noeeprom();
             }
             break;
         default: {
-                rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
                 rgb_matrix_enable_noeeprom();
             }
             break;
diff --git a/users/xulkal/process_records.c b/users/xulkal/process_records.c
index 9c0274823bd..ca2376145df 100644
--- a/users/xulkal/process_records.c
+++ b/users/xulkal/process_records.c
@@ -40,7 +40,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
 #ifdef RGB_MATRIX_TOG_LAYERS
         case RGB_TOG:
             if (record->event.pressed) {
-              rgb_matrix_decrease_flags();
+              rgb_matrix_increase_flags();
             }
             return false;
 #endif