timer fixes

This commit is contained in:
2023-02-25 22:06:52 +01:00
parent 81ee94e502
commit 42930e7d5e
4 changed files with 28 additions and 6 deletions

View File

@@ -420,7 +420,7 @@ ImVec2 timerWindow(DrawData& drawData, ApplicationData& appData)
}
ImGui::SameLine();
ImGui::PushItemWidth(35.f);
ImGui::PushItemWidth(45.f);
if (ImGui::InputFloat("##timer", &timerDisplayMinutes, 0, 0, "%.0fm"))
{
appData.settings.timerDuration = timerDisplayMinutes * 60.f;
@@ -437,12 +437,20 @@ ImVec2 timerWindow(DrawData& drawData, ApplicationData& appData)
char timeStr[32];
std::string timerText;
if (timerData.isTimerActive && timerData.timerHasNotified)
if (timerData.isTimerActive)
{
if (timerData.timerHasNotified)
{
formatTime(timerData.timerStartTimestamp + std::chrono::seconds((int)appData.settings.timerDuration), timeStr, sizeof(timeStr));
timerText = std::format("Ended at {}", timeStr);
}
else
{
formatTime(appData.timerData.timerStartTimestamp + std::chrono::seconds((int)appData.settings.timerDuration), timeStr, sizeof(timeStr));
timerText = std::format("Ends at {}", timeStr);
}
}
else
{
formatTime(std::chrono::system_clock::now() + std::chrono::seconds((int)appData.settings.timerDuration), timeStr, sizeof(timeStr));
timerText = std::format("Ends at {}", timeStr);