Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

handle possible DST change within FloorTime() #568

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+13 −1
Open

handle possible DST change within FloorTime() #568

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ec8f1c
handle possible DST change within FloorTime()
shrddr May 11, 2024
13d2746
adjust major time ticks ±1 hour on DST change
shrddr May 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion implot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,6 +1036,7 @@ ImPlotTime FloorTime(const ImPlotTime& t, ImPlotTimeUnit unit) {
case ImPlotTimeUnit_Min: gp.Tm.tm_sec = 0; break;
default: return t;
}
if (unit >= ImPlotTimeUnit_Day) gp.Tm.tm_isdst = -1;
return MkTime(&gp.Tm);
}

Expand Down Expand Up @@ -1253,9 +1254,20 @@ void Locator_Time(ImPlotTicker& ticker, const ImPlotRange& range, float pixels,
const int step = GetTimeStep(minor_per_major, unit0);
// generate ticks
ImPlotTime t1 = FloorTime(ImPlotTime::FromDouble(range.Min), unit1);
ImPlotContext& gp = *GImPlot;
GetTime(t1, &gp.Tm);
int prev_major_is_dst = gp.Tm.tm_isdst;
while (t1 < t_max) {
// get next major
const ImPlotTime t2 = AddTime(t1, unit1, 1);
ImPlotTime t2 = AddTime(t1, unit1, 1);
if (GetStyle().UseLocalTime && (unit1 == ImPlotTimeUnit_Day || unit1 == ImPlotTimeUnit_Mo)) {
GetTime(t2, &gp.Tm);
if (prev_major_is_dst == 0 && gp.Tm.tm_isdst == 1) // local clock adjusted ahead, current day/month is shorter
t2 = AddTime(t2, ImPlotTimeUnit_Hr, -1);
if (prev_major_is_dst == 1 && gp.Tm.tm_isdst == 0) // local clock adjusted back, current day/month is longer
t2 = AddTime(t2, ImPlotTimeUnit_Hr, 1);
prev_major_is_dst = gp.Tm.tm_isdst;
}
// add major tick
if (t1 >= t_min && t1 <= t_max) {
// minor level 0 tick
Expand Down