aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorpepp <pelloux@gmail.com>2009-12-23 02:41:14 +0800
committerMilan Crha <mcrha@redhat.com>2009-12-23 02:41:14 +0800
commit1cbedea49d693f4028061edab4fd4fb3d500f382 (patch)
tree077eac162903c0fa452a9cdddd75501082a60e02 /calendar/gui
parent9112fc1490a9befad31dd3ec5ae3f919d8738f5b (diff)
downloadgsoc2013-evolution-1cbedea49d693f4028061edab4fd4fb3d500f382.tar
gsoc2013-evolution-1cbedea49d693f4028061edab4fd4fb3d500f382.tar.gz
gsoc2013-evolution-1cbedea49d693f4028061edab4fd4fb3d500f382.tar.bz2
gsoc2013-evolution-1cbedea49d693f4028061edab4fd4fb3d500f382.tar.lz
gsoc2013-evolution-1cbedea49d693f4028061edab4fd4fb3d500f382.tar.xz
gsoc2013-evolution-1cbedea49d693f4028061edab4fd4fb3d500f382.tar.zst
gsoc2013-evolution-1cbedea49d693f4028061edab4fd4fb3d500f382.zip
Bug #592117 - Calendar Day view All Day events print improvements
- reduced height of event boxes - reduced spacing between boxes - the '...' mark overlaps the last event box - add a 2px margin at the top/bottom of the all day events container
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/print.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index e48d60fced..ef511e5913 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -132,7 +132,7 @@ get_font_size (PangoFontDescription *font)
#define DAY_VIEW_MIN_ROWS_IN_TOP_DISPLAY 2
/* The row height for long events in the day view. */
-#define DAY_VIEW_ROW_HEIGHT 20
+#define DAY_VIEW_ROW_HEIGHT 14
/* The minutes per row in the day view printout. */
#define DAY_VIEW_MINS_PER_ROW 30
@@ -1100,8 +1100,8 @@ print_day_long_event (GtkPrintContext *context, PangoFontDescription *font,
x1 = left + 10;
x2 = right - 10;
- y1 = top + event->start_row_or_col * row_height + 4;
- y2 = y1 + row_height-7;
+ y1 = top + event->start_row_or_col * row_height + 1;
+ y2 = y1 + row_height - 1;
red = green = blue = 0.95;
e_cal_model_get_rgb_color_for_component (model, event->comp_data, &red, &green, &blue);
print_border_with_triangles (context, x1, x2, y1, y2, 0.5, red, green, blue,
@@ -1245,6 +1245,8 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
double font_size, max_font_size;
cairo_t *cr;
GdkPixbuf *pixbuf = NULL;
+#define LONG_DAY_EVENTS_TOP_SPACING 4
+#define LONG_DAY_EVENTS_BOTTOM_SPACING 2
ECalModel *model = gnome_calendar_get_model (gcal);
@@ -1315,7 +1317,7 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
for (i = 0; i < rows_in_top_display && i < pdi.long_events->len; i++) {
event = &g_array_index (pdi.long_events, EDayViewEvent, i);
- print_day_long_event (context, font, left, right, top, bottom,
+ print_day_long_event (context, font, left, right, top + LONG_DAY_EVENTS_TOP_SPACING, bottom,
DAY_VIEW_ROW_HEIGHT, event, &pdi, model);
}
@@ -1324,8 +1326,6 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
cairo_t *cr = gtk_print_context_get_cairo_context (context);
gint x, y;
- rows_in_top_display++;
-
if (!pixbuf) {
const gchar **xpm = (const gchar **)jump_xpm;
@@ -1339,9 +1339,9 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
/* Right align - 10 comes from print_day_long_event too */
x = right - gdk_pixbuf_get_width (pixbuf) * 0.5 - 10;
- /* Placing '...' at mid height. 4 and 7 constant come from print_day_long_event
- (offsets used to place events boxes in their respective cells) */
- y = top + DAY_VIEW_ROW_HEIGHT * i + (DAY_VIEW_ROW_HEIGHT - 4 - 7) * 0.5;
+ /* Placing '...' over the last all day event entry printed. '-1 -1' comes
+ from print_long_day_event (top/bottom spacing in each cell) */
+ y = top + LONG_DAY_EVENTS_TOP_SPACING + DAY_VIEW_ROW_HEIGHT * (i - 1) + (DAY_VIEW_ROW_HEIGHT - 1 - 1) * 0.5;
cairo_save (cr);
cairo_scale (cr, 0.5, 0.5);
@@ -1358,11 +1358,12 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
cairo_set_source_rgb (cr, 0, 0, 0);
print_border (context, left, right,
- top, top + rows_in_top_display * DAY_VIEW_ROW_HEIGHT - 4,
+ top,
+ top + rows_in_top_display * DAY_VIEW_ROW_HEIGHT + LONG_DAY_EVENTS_TOP_SPACING + LONG_DAY_EVENTS_BOTTOM_SPACING,
1.0, -1.0);
/* Adjust the area containing the main display. */
- top += rows_in_top_display * DAY_VIEW_ROW_HEIGHT - 2;
+ top += rows_in_top_display * DAY_VIEW_ROW_HEIGHT + LONG_DAY_EVENTS_TOP_SPACING + LONG_DAY_EVENTS_BOTTOM_SPACING;
/* Draw the borders, lines, and times down the left. */
print_day_background (context, gcal, whence, &pdi,