Change param to battery, add param for icon, hide power when plugged in

src/hud_elements.cpp

@@ -578,20 +578,13 @@ void HudElements::vkbasalt(){
     }
 }
 
-void HudElements::battery_percent(){
+void HudElements::battery(){
     if (Battery_Stats.batt_count > 0) {
-        if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_battery_percent]){
+        if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_battery]) {
             ImGui::TableNextRow(); ImGui::TableNextColumn();
             ImGui::TextColored(HUDElements.colors.battery, "BATT");
             ImGui::TableNextColumn();
-            right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.0f", Battery_Stats.current_percent);
-            ImGui::SameLine(0,1.0f);
-            ImGui::Text("%%");
-        }
-
-        if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_battery_percent] && HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_battery_power]){
-            ImGui::TableNextColumn();
-            if (Battery_Stats.isCharging()) {
+            if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_battery_icon]) {
                 switch(int(Battery_Stats.current_percent)){
                     case 0 ... 33:
                         right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", ICON_FK_BATTERY_QUARTER);
@@ -599,16 +592,21 @@ void HudElements::battery_percent(){
                     case 34 ... 66:
                         right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", ICON_FK_BATTERY_HALF);
                         break;
-                    case 67 ... 99:
+                    case 67 ... 97:
                         right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", ICON_FK_BATTERY_THREE_QUARTERS);
                         break;
+                    case 98 ... 100:
+                        right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", ICON_FK_BATTERY_FULL);
+                        break;
                 }
             }
-
-            else if(Battery_Stats.fullCharge() && !Battery_Stats.isCharging()) {
-               right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", ICON_FK_BATTERY_FULL);
-            }
             else {
+                right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.0f", Battery_Stats.current_percent);
+                ImGui::SameLine(0,1.0f);
+                ImGui::Text("%%");
+            }
+            if (!Battery_Stats.isCharging()) {
+                ImGui::TableNextColumn();
                 right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.1f", Battery_Stats.current_watt);
                 ImGui::SameLine(0,1.0f);
                 ImGui::PushFont(HUDElements.sw_stats->font1);
@@ -771,7 +769,7 @@ void HudElements::sort_elements(std::pair<std::string, std::string> option){
     if (param == "vkbasalt")        { ordered_functions.push_back({vkbasalt, value});               }
     if (param == "exec")            { ordered_functions.push_back({_exec, value});
                                       exec_list.push_back({int(ordered_functions.size() - 1), value});       }
-    if (param == "battery_percent")   {ordered_functions.push_back({battery_percent, value});           }
+    if (param == "battery")         { ordered_functions.push_back({battery, value});                }
     if (param == "graphs"){
         if (!HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_graphs])
             HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_graphs] = true;

src/hud_elements.h

@@ -57,8 +57,7 @@ class HudElements{
         static void gamemode();
         static void graphs();
         static void _exec();
-        static void battery_power();
-        static void battery_percent();
+        static void battery();
 
         void convert_colors(struct overlay_params& params);
         void convert_colors(bool do_conv, struct overlay_params& params);

src/overlay.cpp

@@ -22,7 +22,7 @@ std::vector<logData> graph_data;
 
 void update_hw_info(struct swapchain_stats& sw_stats, struct overlay_params& params, uint32_t vendorID)
 {
-    if (params.enabled[OVERLAY_PARAM_ENABLED_battery_percent]) {
+    if (params.enabled[OVERLAY_PARAM_ENABLED_battery]) {
        Battery_Stats.update();
     }
    if (params.enabled[OVERLAY_PARAM_ENABLED_cpu_stats] || logger->is_active()) {

src/overlay_params.h

@@ -68,8 +68,8 @@ typedef unsigned long KeySym;
    OVERLAY_PARAM_BOOL(exec)                          \
    OVERLAY_PARAM_BOOL(vkbasalt)                      \
    OVERLAY_PARAM_BOOL(gamemode)                      \
-   OVERLAY_PARAM_BOOL(battery_power)                 \
-   OVERLAY_PARAM_BOOL(battery_percent)               \
+   OVERLAY_PARAM_BOOL(battery)                       \
+   OVERLAY_PARAM_BOOL(battery_icon)                  \
    OVERLAY_PARAM_CUSTOM(fps_sampling_period)         \
    OVERLAY_PARAM_CUSTOM(output_folder)               \
    OVERLAY_PARAM_CUSTOM(output_file)                 \