diff --git a/src/hud_elements.cpp b/src/hud_elements.cpp index 3cac5af566..268b422f2a 100644 --- a/src/hud_elements.cpp +++ b/src/hud_elements.cpp @@ -249,14 +249,6 @@ static void ImguiNextColumnOrNewRow(int column = -1) static bool ImGuiTextOverflow(const char* text) { return ImGui::CalcTextSize(text).x > ImGui::CalcItemWidth() + HUDElements.ralign_width / 2; } -// This function is only used in battery and battery is not used in windows builds -// Battery should probably be reworked to not use this func since nothing else needs it -#ifdef __linux__ -static void ImGuiTableSetColumnIndex(int column) -{ - ImGui::TableSetColumnIndex(std::max(0, std::min(column, ImGui::TableGetColumnCount() - 1))); -} -#endif void HudElements::time(){ if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_time]){ @@ -1267,24 +1259,15 @@ void HudElements::battery(){ char time_buffer[32]; snprintf(time_buffer, sizeof(time_buffer), "%02d:%02d", static_cast(hours), static_cast(minutes)); - if (!HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_horizontal] && !HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact]){ - ImGui::TableNextRow(); - ImGui::NextColumn(); - ImGui::PushFont(HUDElements.sw_stats->font_small); - ImGuiTableSetColumnIndex(0); - HUDElements.TextColored(HUDElements.colors.text, "%s", "Remaining Time"); - ImGui::PopFont(); - ImGuiTableSetColumnIndex(2); - } else { - if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_horizontal]) - ImguiNextColumnOrNewRow(); - - ImguiNextColumnOrNewRow(); - } - if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact]) - ImGuiTableSetColumnIndex(0); - - right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", time_buffer); + ImguiNextColumnOrNewRow(); + if (!HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_horizontal]) + right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", time_buffer); + else + right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width * 1.25f, "%s", time_buffer); + ImGui::SameLine(0, 1.0f); + ImGui::PushFont(HUDElements.sw_stats->font_small); + HUDElements.TextColored(HUDElements.colors.text, "REM"); + ImGui::PopFont(); } } else { ImguiNextColumnOrNewRow();