diff options
Diffstat (limited to 'calendar')
-rw-r--r-- | calendar/ChangeLog | 12 | ||||
-rw-r--r-- | calendar/gui/e-meeting-model.c | 4 | ||||
-rw-r--r-- | calendar/gui/e-meeting-time-sel.c | 4 |
3 files changed, 15 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index f50d31ddb2..9454706d6e 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,17 @@ 2001-10-23 JP Rosevear <jpr@ximian.com> + * gui/e-meeting-model.c (build_etable): no longer set the + scrollbar policy here + + * gui/e-meeting-time-sel.c + (e_meeting_time_selector_update_main_canvas_scroll_region): add an + extra row to the height so the click to add row can be properly + seen + (e_meeting_time_selector_construct): set the scrollbar policy for + the etable scrolled + +2001-10-23 JP Rosevear <jpr@ximian.com> + * cal-util/timeutil.c (icaltimetype_to_tm): convert an icaltimetype to a tm (tm_to_icaltimetype): vice versa diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c index 0271d7bd0c..f787896801 100644 --- a/calendar/gui/e-meeting-model.c +++ b/calendar/gui/e-meeting-model.c @@ -738,12 +738,8 @@ build_etable (ETableModel *model, const gchar *spec_file, const gchar *state_fil e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); e_table_extras_add_cell (extras, "statusedit", popup_cell); - etable = e_table_scrolled_new_from_spec_file (model, extras, spec_file, NULL); - real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (etable)); - e_scroll_frame_set_policy (E_SCROLL_FRAME (etable), GTK_POLICY_NEVER, GTK_POLICY_NEVER); - e_scroll_frame_set_scrollbar_spacing (E_SCROLL_FRAME (etable), 0); e_table_load_state (real_table, state_file); #if 0 diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 74cb9bcf12..e4252ea4ba 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -332,6 +332,8 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em mts->etable = GTK_WIDGET (e_meeting_model_etable_from_model (mts->model, EVOLUTION_ETSPECDIR "/e-meeting-time-sel.etspec", filename)); + e_scroll_frame_set_policy (E_SCROLL_FRAME (mts->etable), GTK_POLICY_NEVER, GTK_POLICY_NEVER); + e_scroll_frame_set_scrollbar_spacing (E_SCROLL_FRAME (mts->etable), 0); real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (mts->etable)); gtk_signal_connect (GTK_OBJECT (real_table->sort_info), "sort_info_changed", @@ -2110,7 +2112,7 @@ e_meeting_time_selector_update_main_canvas_scroll_region (EMeetingTimeSelector * { gint height, canvas_height; - height = mts->row_height * (e_meeting_model_count_attendees (mts->model) + 1); + height = mts->row_height * (e_meeting_model_count_attendees (mts->model) + 2); canvas_height = GTK_WIDGET (mts->display_main)->allocation.height; height = MAX (height, canvas_height); |