** Fix for bug #246313

2009-01-15  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #246313

	* gui/e-day-view.c: (e_day_view_check_if_new_event_fits): Removed.
	* gui/e-day-view.h: (struct _EDayView):
	* gui/e-day-view.c: (e_day_view_init), (e_day_view_size_allocate),
	(e_day_view_recalc_main_canvas_size), (e_day_view_recalc_cell_sizes),
	(e_day_view_update_scroll_regions), (e_day_view_check_layout):
	* gui/e-day-view-layout.h: (e_day_view_layout_day_events):
	* gui/e-day-view-layout.c: (e_day_view_layout_day_events),
	(e_day_view_layout_day_event), (e_day_view_expand_day_event):
	Added ability to show all event in one-day view, but show only up
	to 6 columns in a multi-day view.
	* gui/print.c: (print_day_details): Always print all events.


svn path=/trunk/; revision=37077

1 files changed, 10 insertions, 2 deletions

diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index 6f4c0d7da1..3a357e332d 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -45,8 +45,11 @@ G_BEGIN_DECLS
    of a normal event. */
 #define E_DAY_VIEW_LONG_EVENT		E_DAY_VIEW_MAX_DAYS
 
-/* The maximum number of columns of appointments within a day. */
-#define E_DAY_VIEW_MAX_COLUMNS		6
+/* The maximum number of columns of appointments within a day in multi-day view. */
+#define E_DAY_VIEW_MULTI_DAY_MAX_COLUMNS 6
+
+/* minimum width of the event in one-day view in pixels */
+#define E_DAY_VIEW_MIN_DAY_COL_WIDTH	60
 
 /* The width of the gap between appointments. This should be at least
    E_DAY_VIEW_BAR_WIDTH, since in the top canvas we use this space to draw
@@ -204,6 +207,9 @@ struct _EDayView
 	/* scrollbar for top_canvas */
 	GtkWidget *tc_vscrollbar;
 
+	/* horizontal scrollbar for main_canvas */
+	GtkWidget *mc_hscrollbar;
+
 	/* The main canvas where the rest of the appointments are shown. */
 	GtkWidget *main_canvas;
 	GnomeCanvasItem *main_canvas_item;
@@ -310,6 +316,8 @@ struct _EDayView
 	   Note that there are a maximum of 12 * 24 rows (when a row is 5 mins)
 	   but we don't always have that many rows. */
 	guint8 cols_per_row[E_DAY_VIEW_MAX_DAYS][12 * 24];
+	/* The maximum number of columns from all rows in cols_per_row */
+	gint max_cols;
 
 	/* Sizes of the various time strings. */
 	gint small_hour_widths[24];