X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar_view.c;h=ffa6356d6cad656606bba06d8bf7df15a35928cd;hb=6de199e2d44877dd4474e57bc3e1d8f36a0d62f9;hp=10e3542a39a17e2a4acd8faaca4cc959d4c47bb9;hpb=d0cfc88543dbdcd6e8ced321dcb49244ec27b231;p=citadel.git diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c index 10e3542a3..ffa6356d6 100644 --- a/webcit/calendar_view.c +++ b/webcit/calendar_view.c @@ -799,7 +799,7 @@ void calendar_day_view_display_events(time_t thetime, int year, int month, struct tm ending_tm; int top = 0; int height = 0; - int gap = 0; + int gap = 1; int startmin = 0; int diffmin = 0; int endmin = 0; @@ -914,38 +914,38 @@ void calendar_day_view_display_events(time_t thetime, int year, int month, if ((event_te.tm_hour < dstart) && (event_tm.tm_hour <= dstart)) { startmin = diffmin = event_te.tm_min / 6; endmin = ((event_tm.tm_hour == hour) ? (event_tm.tm_min / 2) : (event_tm.tm_min / 6)) ; - top = (event_te.tm_hour * 11) + startmin -1; - height= ((event_tm.tm_hour - event_te.tm_hour) * 11) + endmin - diffmin ; + top = (event_te.tm_hour * 10) + startmin -1; + height= ((event_tm.tm_hour - event_te.tm_hour) * 10) + endmin - diffmin ; } if ((event_te.tm_hour < dstart) && (event_tm.tm_hour >= dstart)) { startmin = diffmin = event_te.tm_min / 6; endmin = event_tm.tm_min / 2; - top = (event_te.tm_hour * 11) + startmin - 1; - height = ((dstart - event_te.tm_hour) * 11) + ((event_tm.tm_hour - dstart) * 31) + endmin - (diffmin * 3); + top = (event_te.tm_hour * 10) + startmin - 1; + height = ((dstart - event_te.tm_hour) * 10) + ((event_tm.tm_hour - dstart) * 30) + endmin - (diffmin * 3); } if ((event_te.tm_hour <= dstart) && (event_tm.tm_hour > dend)) { startmin = diffmin = ((event_te.tm_hour == hour) ? (event_te.tm_min / 2) : (event_te.tm_min / 6)) ; endmin = event_tm.tm_min / 6; - top = (event_te.tm_hour * 11) + startmin - 1; - height = ((dstart - event_te.tm_hour) * 11) + ((dend - dstart + 1) * 31) + ((event_tm.tm_hour - dend - 1) * 10) + endmin - diffmin; + top = (event_te.tm_hour * 10) + startmin - 1; + height = ((dstart - event_te.tm_hour) * 10) + ((dend - dstart + 1) * 30) + ((event_tm.tm_hour - dend - 1) * 10) + endmin - diffmin; } if ((event_te.tm_hour >= dstart) && (event_tm.tm_hour <= dend)) { startmin = diffmin = (event_te.tm_min / 2); endmin = event_tm.tm_min / 2; - top = (dstart * 11) + ((event_te.tm_hour - dstart) * 31) + startmin - 1; - height = ((event_tm.tm_hour - event_te.tm_hour) * 31) + endmin - diffmin; + top = (dstart * 10) + ((event_te.tm_hour - dstart) * 30) + startmin - 1; + height = ((event_tm.tm_hour - event_te.tm_hour) * 30) + endmin - diffmin; } if ((event_te.tm_hour >= dstart) && (event_te.tm_hour <= dend) && (event_tm.tm_hour > dend)) { startmin = diffmin = (event_te.tm_min / 2); endmin = event_tm.tm_min / 6; - top = (dstart * 11) + ((event_te.tm_hour - dstart) * 31) + diffmin - 1; - height = (((dend - event_te.tm_hour + 1) * 31) + ((event_tm.tm_hour - dend - 1) * 11)) + endmin - diffmin; + top = (dstart * 10) + ((event_te.tm_hour - dstart) * 30) + diffmin - 1; + height = (((dend - event_te.tm_hour + 1) * 30) + ((event_tm.tm_hour - dend - 1) * 10)) + endmin - diffmin; } if ((event_te.tm_hour > dend) && (event_tm.tm_hour > dend)) { startmin = diffmin = event_te.tm_min / 6; endmin = event_tm.tm_min / 6; - top = (dstart * 11) + ((dend - dstart + 1) * 31) + ((event_tm.tm_hour - event_te.tm_hour) * 11) + startmin - 1; - height = ((event_tm.tm_hour - event_te.tm_hour) * 11) + endmin - diffmin; + top = (dstart * 10) + ((dend - dstart + 1) * 30) + ((event_tm.tm_hour - event_te.tm_hour) * 10) + startmin - 1; + height = ((event_tm.tm_hour - event_te.tm_hour) * 10) + endmin - diffmin; } wprintf("