diff options
| author | Damon Chaplin <damon@helixcode.com> | 2000-06-21 13:53:23 +0800 |
|---|---|---|
| committer | Damon Chaplin <damon@src.gnome.org> | 2000-06-21 13:53:23 +0800 |
| commit | 56b15f58e0a3cd3bc8bc4103dcab403b49cda7b1 (patch) | |
| tree | 17a6e4e9d4eb1b84f756210433055a1b545fa69e | |
| parent | dad705c65cc4da62ed23ad917321d274246a05a5 (diff) | |
| download | gsoc2013-evolution-56b15f58e0a3cd3bc8bc4103dcab403b49cda7b1.tar.gz gsoc2013-evolution-56b15f58e0a3cd3bc8bc4103dcab403b49cda7b1.tar.zst gsoc2013-evolution-56b15f58e0a3cd3bc8bc4103dcab403b49cda7b1.zip | |
set event before using it! (e_day_view_init): used new colors from tigert.
2000-06-21 Damon Chaplin <damon@helixcode.com>
* gui/e-day-view.c (e_day_view_reshape_long_event): set event before
using it!
(e_day_view_init): used new colors from tigert.
svn path=/trunk/; revision=3671
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 17 |
2 files changed, 15 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index d703c1f2a8..7dda8739bd 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2000-06-21 Damon Chaplin <damon@helixcode.com> + + * gui/e-day-view.c (e_day_view_reshape_long_event): set event before + using it! + (e_day_view_init): used new colors from tigert. + 2000-06-21 Christopher James Lahey <clahey@helixcode.com> * gui/e-day-view.c, gui/e-week-view.c: Remove the usage of the "x" diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 50d9fb5ec4..4e56ad3885 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -512,13 +512,13 @@ e_day_view_init (EDayView *day_view) /* Allocate the colors. */ #if 1 - day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING].red = 255 * 257; - day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING].green = 255 * 257; - day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING].blue = 131 * 257; + day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING].red = 247 * 257; + day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING].green = 247 * 257; + day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING].blue = 244 * 257; - day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].red = 211 * 257; - day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].green = 208 * 257; - day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].blue = 6 * 257; + day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].red = 216 * 257; + day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].green = 216 * 257; + day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].blue = 214 * 257; #else /* FG: MistyRose1, LightPink3 | RosyBrown | MistyRose3. */ @@ -3326,6 +3326,9 @@ e_day_view_reshape_long_event (EDayView *day_view, gchar *text, *end_of_line; gboolean show_icons = TRUE, use_max_width = FALSE; + event = &g_array_index (day_view->long_events, EDayViewEvent, + event_num); + if (!e_day_view_get_long_event_position (day_view, event_num, &start_day, &end_day, &item_x, &item_y, @@ -3343,8 +3346,6 @@ e_day_view_reshape_long_event (EDayView *day_view, item_y += E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD; item_h -= (E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD) * 2; - event = &g_array_index (day_view->long_events, EDayViewEvent, - event_num); /* We don't show the icons while resizing, since we'd have to draw them on top of the resize rect. Nor when editing. */ num_icons = 0; |