Only display battery stats if a battery is present

pull/536/head
Alessandro Toia 3 years ago
parent a533883a39
commit 500a65dd52

@ -579,41 +579,42 @@ void HudElements::vkbasalt(){
} }
void HudElements::battery_percent(){ void HudElements::battery_percent(){
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_battery_percent]){ if (Battery_Stats.batt_count > 0) {
ImGui::TableNextRow(); ImGui::TableNextColumn(); if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_battery_percent]){
ImGui::TextColored(HUDElements.colors.battery, "BATT"); ImGui::TableNextRow(); ImGui::TableNextColumn();
ImGui::TableNextColumn(); ImGui::TextColored(HUDElements.colors.battery, "BATT");
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.0f", Battery_Stats.current_percent); ImGui::TableNextColumn();
ImGui::SameLine(0,1.0f); right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.0f", Battery_Stats.current_percent);
ImGui::Text("%%"); ImGui::SameLine(0,1.0f);
ImGui::Text("%%");
} }
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_battery_percent] && HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_battery_power]){ if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_battery_percent] && HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_battery_power]){
ImGui::TableNextColumn(); ImGui::TableNextColumn();
if (Battery_Stats.isCharging()) { if (Battery_Stats.isCharging()) {
switch(int(Battery_Stats.current_percent)){ switch(int(Battery_Stats.current_percent)){
case 0 ... 33: case 0 ... 33:
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", ICON_FK_BATTERY_QUARTER); right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", ICON_FK_BATTERY_QUARTER);
break; break;
case 34 ... 66: case 34 ... 66:
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", ICON_FK_BATTERY_HALF); right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", ICON_FK_BATTERY_HALF);
break; break;
case 67 ... 99: case 67 ... 99:
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", ICON_FK_BATTERY_THREE_QUARTERS); right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", ICON_FK_BATTERY_THREE_QUARTERS);
break; break;
}
} }
}
else if(Battery_Stats.fullCharge() && !Battery_Stats.isCharging()) { else if(Battery_Stats.fullCharge() && !Battery_Stats.isCharging()) {
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", ICON_FK_BATTERY_FULL); right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", ICON_FK_BATTERY_FULL);
} }
else { else {
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.1f", Battery_Stats.current_watt); right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.1f", Battery_Stats.current_watt);
ImGui::SameLine(0,1.0f); ImGui::SameLine(0,1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1); ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("W"); ImGui::Text("W");
ImGui::PopFont(); ImGui::PopFont();
}
} }
} }
} }

Loading…
Cancel
Save