diff options
| -rw-r--r-- | calendar/ChangeLog | 11 | ||||
| -rw-r--r-- | calendar/gui/e-week-view-layout.c | 97 | ||||
| -rw-r--r-- | calendar/gui/e-week-view.c | 25 |
3 files changed, 97 insertions, 36 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index a0bf88c458..f3fd948722 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,14 @@ +2007-11-27 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #214645 + + * gui/e-week-view.c: (e_week_view_get_day_position), + (e_week_view_convert_position_to_day): + * gui/e-week-view-layout.c: (e_week_view_layout_event), + (e_week_view_layout_get_span_position): + Collapses non-working days to occupy one row and expand other days + if possible. + 2007-11-26 Milan Crha <mcrha@redhat.com> ** Fix for bug #346693 diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c index 3f7ee03011..c9c52b8359 100644 --- a/calendar/gui/e-week-view-layout.c +++ b/calendar/gui/e-week-view-layout.c @@ -29,7 +29,7 @@ #include <config.h> #include "e-week-view-layout.h" - +#include "calendar-config.h" static void e_week_view_layout_event (EWeekViewEvent *event, guint8 *grid, @@ -295,7 +295,7 @@ e_week_view_layout_get_day_position (gint day, gint *day_y, gint *rows) { - gint week, day_of_week, row, col, weekend_col, box, weekend_box; + gint week, day_of_week, col, weekend_col; *day_x = *day_y = *rows = 0; g_return_if_fail (day >= 0); @@ -336,36 +336,75 @@ e_week_view_layout_get_day_position (gint day, *day_x = col; } } else { + #define wk(x) ( ( working_days & (days [ ((x) + display_start_day) % 7 ]) ) ? 1 : 0) + CalWeekdays days [] = {CAL_MONDAY, CAL_TUESDAY, CAL_WEDNESDAY, CAL_THURSDAY, CAL_FRIDAY, CAL_SATURDAY, CAL_SUNDAY}; + CalWeekdays working_days; + int arr[4] = {1, 1, 1, 1}; + int edge, i, wd, m, M; + gboolean any = TRUE; + g_return_if_fail (day < 7); - /* Calculate which box to place the day in, from 0-5. - Note that in the week view the weekends are always - compressed and share a box. */ - box = day; - day_of_week = (display_start_day + day) % 7; - weekend_box = (5 + 7 - display_start_day) % 7; - if (box > weekend_box) - box--; + working_days = calendar_config_get_working_days (); + edge = 3; - if (box < 3) + if (wk (0) + wk (1) + wk (2) < wk (3) + wk (4) + wk (5) + wk (6)) + edge ++; + + if (day < edge) { *day_x = 0; - else + m = 0; + M = edge; + } else { *day_x = 1; + m = edge; + M = 7; + } - row = (box % 3) * 2; - if (day_of_week < 5) { - *day_y = row; - *rows = 2; - } else if (day_of_week == 5) { - /* Saturday. */ - *day_y = row; - *rows = 1; + wd = 0; /* number of used rows in column */ + for (i = m; i < M; i++) { + arr [i - m] += wk (i); + wd += arr [i - m]; + } - } else { - /* Sunday. */ - *day_y = row + 1; - *rows = 1; + while (wd != 6 && any) { + any = FALSE; + + for (i = M - 1; i >= m; i--) { + if (arr [i - m] > 1) { + any = TRUE; + + if (wd > 6) { /* too many rows, make last shorter */ + arr [i - m] --; + wd --; + } else if (wd < 6) { /* free rows left, enlarge those bigger */ + arr [i - m] ++; + wd ++; + } + + if (wd == 6) + break; + } + } + + if (!any && wd != 6) { + any = TRUE; + + for (i = m; i < M; i++) { + arr [i - m] += 3; + wd += 3; + } + } + } + + *rows = arr [day - m]; + + *day_y = 0; + for (i = m; i < day; i++) { + *day_y += arr [i - m]; } + + #undef wk } } @@ -388,7 +427,7 @@ e_week_view_layout_get_span_position (EWeekViewEvent *event, { gint end_day_of_week; - if (span->row >= rows_per_cell) + if (multi_week_view && span->row >= rows_per_cell) return FALSE; end_day_of_week = (display_start_day + span->start_day @@ -413,9 +452,11 @@ e_week_view_layout_get_span_position (EWeekViewEvent *event, } } } else { - /* All spans are 1 day long in the week view, so we - just skip it. */ - if (end_day_of_week > 4) + gint day_x, day_y, rows = 0; + e_week_view_layout_get_day_position (end_day_of_week, multi_week_view, 1, display_start_day, compress_weekend, + &day_x, &day_y, &rows); + + if (((rows / 2) * rows_per_cell) + ((rows % 2) * rows_per_compressed_cell) <= span->row) return FALSE; } } diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 9d539cecba..47a939a4de 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -1978,8 +1978,12 @@ e_week_view_get_day_position (EWeekView *week_view, *day_w = week_view->col_widths[cell_x]; *day_h = week_view->row_heights[cell_y]; - if (cell_h == 2) + + while (cell_h > 1) { *day_h += week_view->row_heights[cell_y + 1]; + cell_h --; + cell_y ++; + } } @@ -2214,7 +2218,7 @@ e_week_view_convert_position_to_day (EWeekView *week_view, gint y) { gint col, row, grid_x = -1, grid_y = -1, week, day; - gint weekend_col, box, weekend_box; + gint weekend_col; /* First we convert it to a grid position. */ for (col = 0; col <= week_view->columns; col++) { @@ -2249,12 +2253,17 @@ e_week_view_convert_position_to_day (EWeekView *week_view, } else { week = 0; - box = grid_x * 3 + grid_y / 2; - weekend_box = (5 + 7 - week_view->display_start_day) % 7; - day = box; - if (box > weekend_box - ||( box == weekend_box && grid_y % 2 == 1)) - day++; + for (day = 0; day < 7; day ++) { + gint day_x = 0, day_y = 0, rows = 0; + e_week_view_layout_get_day_position (day, FALSE, 1, week_view->display_start_day, week_view->compress_weekend, + &day_x, &day_y, &rows); + + if (grid_x == day_x && grid_y >= day_y && grid_y < day_y + rows) + break; + } + + if (day == 7) + return -1; } return week * 7 + day; |