From c0bb6015a0e102bb797add09aff76445f51c9bab Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Sat, 22 Jun 2024 12:48:16 +0200
Subject: [PATCH] Backlitht zones for on-battery state
 https://github.com/seerge/g-helper/issues/2739

---
 app/AppConfig.cs |  5 +++++
 app/Extra.cs     |  6 +++---
 app/USB/Aura.cs  | 12 ++++++------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/AppConfig.cs b/app/AppConfig.cs
index 7d4bad04..370dc950 100644
--- a/app/AppConfig.cs
+++ b/app/AppConfig.cs
@@ -440,6 +440,11 @@ public static class AppConfig
         return IsStrix() || ContainsModel("GX650");
     }
 
+    public static bool IsBacklightZones()
+    {
+        return IsStrix() || IsZ13();
+    }
+
     public static bool IsStrixLimitedRGB()
     {
         return ContainsModel("G512LI") || ContainsModel("G513R") || ContainsModel("G713PV") || ContainsModel("G513IE") || ContainsModel("G713RC") || ContainsModel("G513QM") || ContainsModel("G531G");
diff --git a/app/Extra.cs b/app/Extra.cs
index c46a3446..19bad3b6 100644
--- a/app/Extra.cs
+++ b/app/Extra.cs
@@ -348,7 +348,7 @@ namespace GHelper
             checkSleepLogo.CheckedChanged += CheckPower_CheckedChanged;
             checkShutdownLogo.CheckedChanged += CheckPower_CheckedChanged;
 
-            if ((!AppConfig.IsStrix() && !AppConfig.IsZ13()) || AppConfig.IsStrixLimitedRGB() || AppConfig.IsARCNM())
+            if (!AppConfig.IsBacklightZones() || AppConfig.IsStrixLimitedRGB() || AppConfig.IsARCNM())
             {
 
                 if (!AppConfig.IsStrixLimitedRGB())
@@ -376,7 +376,7 @@ namespace GHelper
                 checkShutdownLogo.Visible = false;
             }
 
-            if (!AppConfig.IsStrix() && !AppConfig.IsZ13())
+            if (!AppConfig.IsBacklightZones())
             {
                 labelBacklightKeyboard.Visible = false;
                 checkBattery.Visible = false;
@@ -777,7 +777,7 @@ namespace GHelper
             AppConfig.Set("keyboard_sleep_logo", (checkSleepLogo.Checked ? 1 : 0));
             AppConfig.Set("keyboard_shutdown_logo", (checkShutdownLogo.Checked ? 1 : 0));
 
-            if (checkBattery.Visible)
+            if (AppConfig.IsBacklightZones())
             {
                 AppConfig.Set("keyboard_awake_bat", (checkBattery.Checked ? 1 : 0));
                 AppConfig.Set("keyboard_awake_bar_bat", (checkBatteryBar.Checked ? 1 : 0));
diff --git a/app/USB/Aura.cs b/app/USB/Aura.cs
index 2cc9c599..7b3b3edb 100644
--- a/app/USB/Aura.cs
+++ b/app/USB/Aura.cs
@@ -354,36 +354,36 @@ namespace GHelper.USB
         public static void ApplyPower()
         {
 
-            bool onBattery = SystemInformation.PowerStatus.PowerLineStatus != PowerLineStatus.Online;
+            bool backlightBattery = AppConfig.IsBacklightZones() && (SystemInformation.PowerStatus.PowerLineStatus != PowerLineStatus.Online);
 
             AuraPower flags = new();
 
             // Keyboard
-            flags.AwakeKeyb = onBattery ? AppConfig.IsOnBattery("keyboard_awake") : AppConfig.IsNotFalse("keyboard_awake");
+            flags.AwakeKeyb = backlightBattery ? AppConfig.IsOnBattery("keyboard_awake") : AppConfig.IsNotFalse("keyboard_awake");
             flags.BootKeyb = AppConfig.IsNotFalse("keyboard_boot");
             flags.SleepKeyb = AppConfig.IsNotFalse("keyboard_sleep");
             flags.ShutdownKeyb = AppConfig.IsNotFalse("keyboard_shutdown");
 
             // Logo
-            flags.AwakeLogo = onBattery ? AppConfig.IsOnBattery("keyboard_awake_logo") : AppConfig.IsNotFalse("keyboard_awake_logo");
+            flags.AwakeLogo = backlightBattery ? AppConfig.IsOnBattery("keyboard_awake_logo") : AppConfig.IsNotFalse("keyboard_awake_logo");
             flags.BootLogo = AppConfig.IsNotFalse("keyboard_boot_logo");
             flags.SleepLogo = AppConfig.IsNotFalse("keyboard_sleep_logo");
             flags.ShutdownLogo = AppConfig.IsNotFalse("keyboard_shutdown_logo");
 
             // Lightbar
-            flags.AwakeBar = onBattery ? AppConfig.IsOnBattery("keyboard_awake_bar") : AppConfig.IsNotFalse("keyboard_awake_bar");
+            flags.AwakeBar = backlightBattery ? AppConfig.IsOnBattery("keyboard_awake_bar") : AppConfig.IsNotFalse("keyboard_awake_bar");
             flags.BootBar = AppConfig.IsNotFalse("keyboard_boot_bar");
             flags.SleepBar = AppConfig.IsNotFalse("keyboard_sleep_bar");
             flags.ShutdownBar = AppConfig.IsNotFalse("keyboard_shutdown_bar");
 
             // Lid
-            flags.AwakeLid = onBattery ? AppConfig.IsOnBattery("keyboard_awake_lid") : AppConfig.IsNotFalse("keyboard_awake_lid");
+            flags.AwakeLid = backlightBattery ? AppConfig.IsOnBattery("keyboard_awake_lid") : AppConfig.IsNotFalse("keyboard_awake_lid");
             flags.BootLid = AppConfig.IsNotFalse("keyboard_boot_lid");
             flags.SleepLid = AppConfig.IsNotFalse("keyboard_sleep_lid");
             flags.ShutdownLid = AppConfig.IsNotFalse("keyboard_shutdown_lid");
 
             // Rear Bar
-            flags.AwakeRear = onBattery ? AppConfig.IsOnBattery("keyboard_awake_lid") : AppConfig.IsNotFalse("keyboard_awake_lid");
+            flags.AwakeRear = backlightBattery ? AppConfig.IsOnBattery("keyboard_awake_lid") : AppConfig.IsNotFalse("keyboard_awake_lid");
             flags.BootRear = AppConfig.IsNotFalse("keyboard_boot_lid");
             flags.SleepRear = AppConfig.IsNotFalse("keyboard_sleep_lid");
             flags.ShutdownRear = AppConfig.IsNotFalse("keyboard_shutdown_lid");