diff options
| author | Hiroyuki Ikezoe <hiikezoe@src.gnome.org> | 2007-08-24 11:37:02 +0800 |
|---|---|---|
| committer | Hiroyuki Ikezoe <hiikezoe@src.gnome.org> | 2007-08-24 11:37:02 +0800 |
| commit | bc34d89ee02483f664062add88308f6984717028 (patch) | |
| tree | d8313ef6c8eb7d3bcfd5c5d0d44a158c2c85620f | |
| parent | 8265014e20671cbc1f0529ddc98c0f0f655e30be (diff) | |
| download | gsoc2013-evolution-bc34d89ee02483f664062add88308f6984717028.tar gsoc2013-evolution-bc34d89ee02483f664062add88308f6984717028.tar.gz gsoc2013-evolution-bc34d89ee02483f664062add88308f6984717028.tar.bz2 gsoc2013-evolution-bc34d89ee02483f664062add88308f6984717028.tar.lz gsoc2013-evolution-bc34d89ee02483f664062add88308f6984717028.tar.xz gsoc2013-evolution-bc34d89ee02483f664062add88308f6984717028.tar.zst gsoc2013-evolution-bc34d89ee02483f664062add88308f6984717028.zip | |
+2007-08-24 Hiroyuki Ikezoe <poincare@ikezoe.net>
+
+ ** Fix for bug #330628
+
+ * gui/e-day-view-top-item.c: (e_day_view_top_item_draw_long_event):
+ Show meeting icon.
+
svn path=/trunk/; revision=34086
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/e-day-view-top-item.c | 22 |
2 files changed, 29 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 42b97168fa..818c464d1d 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2007-08-24 Hiroyuki Ikezoe <poincare@ikezoe.net> + + ** Fix for bug #330628 + + * gui/e-day-view-top-item.c: (e_day_view_top_item_draw_long_event): + Show meeting icon. + 2007-08-23 Milan Crha <mcrha@redhat.com> ** Fix for bug #385517 diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c index 5e960ac8d5..6d45bf6130 100644 --- a/calendar/gui/e-day-view-top-item.c +++ b/calendar/gui/e-day-view-top-item.c @@ -544,6 +544,7 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem, 0, 0); icon_x -= icon_x_inc; } + if (icon_x <= max_icon_x && e_cal_component_has_alarms (comp)) { gdk_gc_set_clip_mask (gc, NULL); gdk_draw_pixbuf (drawable, gc, @@ -556,6 +557,18 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem, icon_x -= icon_x_inc; } + if (icon_x <= max_icon_x && e_cal_component_has_organizer (comp)) { + gdk_gc_set_clip_mask (gc, NULL); + gdk_draw_pixbuf (drawable, gc, + day_view->meeting_icon, + 0, 0, icon_x, icon_y, + E_DAY_VIEW_ICON_WIDTH, + E_DAY_VIEW_ICON_HEIGHT, + GDK_RGB_DITHER_NORMAL, + 0, 0); + icon_x -= icon_x_inc; + } + /* draw categories icons */ e_cal_component_get_categories_list (comp, &categories_list); for (elem = categories_list; elem; elem = elem->next) { @@ -1145,6 +1158,15 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem, icon_x -= icon_x_inc; } + if (icon_x <= max_icon_x && e_cal_component_has_organizer (comp)) { + cairo_save (cr); + gdk_cairo_set_source_pixbuf (cr, day_view->meeting_icon, icon_x, icon_y); + cairo_paint (cr); + cairo_restore (cr); + + icon_x -= icon_x_inc; + } + /* draw categories icons */ e_cal_component_get_categories_list (comp, &categories_list); for (elem = categories_list; elem; elem = elem->next) { |