fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not mark slice of end time busy

Browse Source 
In weekly view, when computing busy slices, do not fill a slot that is
only hit by the end time of an appointment.

Suggested-by: Håkan Jerning <jerning@home.se>
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2015-04-11 10:37:54 +02:00
parent d354a4a05d
commit 776ef24075
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/day.c
View File

@ -582,8 +582,15 @@ unsigned day_chk_busy_slices(struct date day, int slicesno, int *slices)
else else
end = DAYINSEC - 1; end = DAYINSEC - 1;
if (!fill_slices /*
(slices, slicesno, SLICENUM(start), SLICENUM(end))) { * If an item ends on 12:00, we do not want the 12:00 slot to
* be marked busy.
*/
if (end > start)
end--;
if (!fill_slices(slices, slicesno, SLICENUM(start),
SLICENUM(end))) {
LLIST_TS_UNLOCK(&recur_alist_p); LLIST_TS_UNLOCK(&recur_alist_p);
return 0; return 0;
} }
@ -603,8 +610,15 @@ unsigned day_chk_busy_slices(struct date day, int slicesno, int *slices)
if (apt->start + apt->dur >= t + DAYINSEC) if (apt->start + apt->dur >= t + DAYINSEC)
end = DAYINSEC - 1; end = DAYINSEC - 1;
if (!fill_slices /*
(slices, slicesno, SLICENUM(start), SLICENUM(end))) { * If an item ends on 12:00, we do not want the 12:00 slot to
* be marked busy.
*/
if (end > start)
end--;
if (!fill_slices(slices, slicesno, SLICENUM(start),
SLICENUM(end))) {
LLIST_TS_UNLOCK(&alist_p); LLIST_TS_UNLOCK(&alist_p);
return 0; return 0;
} }