aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMilan Crha <mcrha@src.gnome.org>2007-10-04 17:27:37 +0800
committerMilan Crha <mcrha@src.gnome.org>2007-10-04 17:27:37 +0800
commit72cc581e8c60c00544473b4b923e2340575997ad (patch)
tree354d9a238483988a4263c446151f5e01e132927b /calendar
parentae05111989a1a4531d3e13ec29c79ab841cc4e15 (diff)
downloadgsoc2013-evolution-72cc581e8c60c00544473b4b923e2340575997ad.tar.gz
gsoc2013-evolution-72cc581e8c60c00544473b4b923e2340575997ad.tar.zst
gsoc2013-evolution-72cc581e8c60c00544473b4b923e2340575997ad.zip
2007-10-04 mcrha Fix for bug #325685
svn path=/trunk/; revision=34353
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/print.c15
2 files changed, 16 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index df79689212..42747afd70 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-04 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #325685
+
+ * gui/print.c: (print_week_day_event): Show end time of the event only
+ when printing week view with less than 3 weeks (because of no space).
+
2007-10-02 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #469657
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 845ae146ba..41d002df79 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -1362,14 +1362,17 @@ print_week_day_event (GtkPrintContext *context, PangoFontDescription *font,
x1 += print_text_size (context, buffer, PANGO_ALIGN_LEFT, x1, x2, y1, y2 + 3 ) + 4;
print_text_size (context, text, PANGO_ALIGN_LEFT, x1, x2, y1, y2 + 3);
- date_tm.tm_hour = event->end_minute / 60;
- date_tm.tm_min = event->end_minute % 60;
+ if (psi->weeks_shown <= 2) {
+ date_tm.tm_hour = event->end_minute / 60;
+ date_tm.tm_min = event->end_minute % 60;
- e_time_format_time (&date_tm, psi->use_24_hour_format, FALSE,
- buffer, sizeof (buffer));
+ e_time_format_time (&date_tm, psi->use_24_hour_format, FALSE,
+ buffer, sizeof (buffer));
+
+ print_rectangle (context, x1, y1, (x2 + 6) - x1, (y2 + 4) - y1, red, green, blue);
+ x1 += print_text_size (context, buffer, PANGO_ALIGN_LEFT, x1, x2, y1, y2 + 3) + 4;
+ }
- print_rectangle (context, x1, y1, (x2 + 6) - x1, (y2 + 4) - y1, red, green, blue);
- x1 += print_text_size (context, buffer, PANGO_ALIGN_LEFT, x1, x2, y1, y2 + 3) + 4;
print_text_size (context, text, PANGO_ALIGN_LEFT, x1, x2, y1, y2 + 3);
}