changed to use EDateEdit.

2000-09-11  Damon Chaplin  <damon@helixcode.com>

	* gui/dialogs/task-editor.c: changed to use EDateEdit.

	* gui/dialogs/task-editor-dialog.glade: added "None" option to
	Classification option menu, and used custom widgets for the date
	entries so we can use EDateEdit widgets.

	* gui/event-editor.c: changed to use EDateEdit. Note that this needs
	to be fixed at some point to handle invalid dates, i.e. when
	e_date_edit_get_time returns -1.

	* gui/calendar-model.c (ensure_task_complete):
	(ensure_task_not_complete): new functions to set the related properties
	to make sure a task is marked as complete on not, i.e. "Date Completed"
	"Status" and "Percent" properties.

2000-09-08  Damon Chaplin  <damon@helixcode.com>

	* gui/calendar-model.c (get_is_complete): use the status field rather
	than the completed date, as it is more reliable.
	(get_is_overdue): use get_is_complete().
	(calendar_model_mark_task_complete): check if it is already complete,
	and if so don't update it.

	* cal-util/cal-component.c (cal_component_get_status):
	(cal_component_set_status): added functions to support the STATUS
	property. Also added the property to CalComponentPrivate and set it
	to NULL in free_icalcomponent(). Someone should check my code as I've
	mainly done a Cut & Paste job.

svn path=/trunk/; revision=5305

1 files changed, 12 insertions, 3 deletions

diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 85bd8872be..06332f525c 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -5051,6 +5051,7 @@ e_day_view_get_event_position (EDayView *day_view,
 {
 	EDayViewEvent *event;
 	gint start_row, end_row, cols_in_row, start_col, num_columns;
+	gfloat width;
 
 	event = &g_array_index (day_view->events[day], EDayViewEvent,
 				event_num);
@@ -5078,12 +5079,20 @@ e_day_view_get_event_position (EDayView *day_view,
 			end_row = day_view->resize_end_row;
 	}
 
-	*item_x = day_view->day_offsets[day] + day_view->day_widths[day] * start_col / cols_in_row;
-	*item_w = day_view->day_widths[day] * num_columns / cols_in_row - E_DAY_VIEW_GAP_WIDTH;
+
+	*item_x = day_view->day_offsets[day]
+		+ day_view->day_widths[day] * start_col / cols_in_row;
+	*item_w = day_view->day_widths[day] * num_columns / cols_in_row
+		- E_DAY_VIEW_GAP_WIDTH;
 	*item_w = MAX (*item_w, 0);
 	*item_y = start_row * day_view->row_height;
+#if 0
 	*item_h = (end_row - start_row + 1) * day_view->row_height;
-
+#else
+	/* This makes the event end on the grid line of the next row,
+	   which maybe looks nicer if you have 2 events on consecutive rows. */
+	*item_h = (end_row - start_row + 1) * day_view->row_height + 1;
+#endif
 	return TRUE;
 }