From 68599a02a33998c3e0e7dcce03d435f6c504d876 Mon Sep 17 00:00:00 2001
From: FlightlessMango <flightlessmangoyt@gmail.com>
Date: Wed, 5 Feb 2020 01:06:10 +0100
Subject: [PATCH] param options for cpu_stats and gpu_stats

---
 src/overlay.cpp      | 23 +++++++++++++----------
 src/overlay_params.c | 12 ++++++++++--
 src/overlay_params.h |  2 ++
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/overlay.cpp b/src/overlay.cpp
index f8d09fc8..bc5f9bc7 100644
--- a/src/overlay.cpp
+++ b/src/overlay.cpp
@@ -1123,7 +1123,7 @@ static void compute_swapchain_display(struct swapchain_data *data)
    }
    
    if (displayHud){
-      if (device_data->gpu_stats){
+      if (device_data->gpu_stats && instance_data->params.enabled[OVERLAY_PARAM_ENABLED_gpu_stats]){
          ImGui::TextColored(ImVec4(0.180, 0.592, 0.384, 1.00f), "GPU");
          ImGui::SameLine(hudFirstRow);
          ImGui::Text("%i%%", gpuLoad);
@@ -1133,15 +1133,18 @@ static void compute_swapchain_display(struct swapchain_data *data)
             ImGui::SameLine(hudSecondRow);
             ImGui::Text("%i%s", gpuTemp, "°C");
          }
-      }    
-      ImGui::TextColored(ImVec4(0.180, 0.592, 0.796, 1.00f), "CPU");
-      ImGui::SameLine(hudFirstRow);
-      ImGui::Text("%d%%", cpuLoadLog);
-      // ImGui::SameLine(150);
-      // ImGui::Text("%s", "%");
-      if (instance_data->params.enabled[OVERLAY_PARAM_ENABLED_cpu_temp]){
-         ImGui::SameLine(hudSecondRow);
-         ImGui::Text("%i%s", cpuTemp, "°C");
+      }
+      if(instance_data->params.enabled[OVERLAY_PARAM_ENABLED_cpu_stats]){
+         ImGui::TextColored(ImVec4(0.180, 0.592, 0.796, 1.00f), "CPU");
+         ImGui::SameLine(hudFirstRow);
+         ImGui::Text("%d%%", cpuLoadLog);
+         // ImGui::SameLine(150);
+         // ImGui::Text("%s", "%");
+      
+         if (instance_data->params.enabled[OVERLAY_PARAM_ENABLED_cpu_temp]){
+            ImGui::SameLine(hudSecondRow);
+            ImGui::Text("%i%s", cpuTemp, "°C");
+         }
       }
       
       if (instance_data->params.enabled[OVERLAY_PARAM_ENABLED_core_load]){
diff --git a/src/overlay_params.c b/src/overlay_params.c
index 27dc5f40..f35cb8a5 100644
--- a/src/overlay_params.c
+++ b/src/overlay_params.c
@@ -175,6 +175,8 @@ parse_overlay_env(struct overlay_params *params,
    params->enabled[OVERLAY_PARAM_ENABLED_core_load] = false;
    params->enabled[OVERLAY_PARAM_ENABLED_cpu_temp] = false;
    params->enabled[OVERLAY_PARAM_ENABLED_gpu_temp] = false;
+   params->enabled[OVERLAY_PARAM_ENABLED_cpu_stats] = true;
+   params->enabled[OVERLAY_PARAM_ENABLED_gpu_stats] = true;
    params->fps_sampling_period = 500000; /* 500ms */
    params->width = 280;
    params->height = 140;
@@ -217,9 +219,15 @@ parse_overlay_env(struct overlay_params *params,
       params->font_size = 24.0f;
 
    if (params->font_size && !heightChanged)
-      params->height = (params->font_size + 3 * 2) * 3 + FrameTimeGraphHeight;
+      params->height = (params->font_size - 3 * 2) * 3 + FrameTimeGraphHeight;
 
    // Apply more hud height if cores are enabled
    if (params->enabled[OVERLAY_PARAM_ENABLED_core_load] && !heightChanged)
      params->height += ((params->font_size - 3) * get_nprocs());
-}
+
+   if (params->enabled[OVERLAY_PARAM_ENABLED_gpu_stats])
+      params->height += (params->font_size - 3);
+
+   if (params->enabled[OVERLAY_PARAM_ENABLED_cpu_stats])
+      params->height += (params->font_size - 3);
+}     
diff --git a/src/overlay_params.h b/src/overlay_params.h
index 0be52a0b..82bf8e0c 100644
--- a/src/overlay_params.h
+++ b/src/overlay_params.h
@@ -41,6 +41,8 @@ extern "C" {
    OVERLAY_PARAM_BOOL(core_load)                     \
    OVERLAY_PARAM_BOOL(cpu_temp)                      \
    OVERLAY_PARAM_BOOL(gpu_temp)                      \
+   OVERLAY_PARAM_BOOL(cpu_stats)                      \
+   OVERLAY_PARAM_BOOL(gpu_stats)                      \
    OVERLAY_PARAM_CUSTOM(fps_sampling_period)         \
    OVERLAY_PARAM_CUSTOM(output_file)                 \
    OVERLAY_PARAM_CUSTOM(position)                    \