aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/e-meeting-time-sel.c11
2 files changed, 13 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b45a52df66..479309260e 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2003-05-20 JP Rosevear <jpr@ximian.com>
+
+ Fixes #43308
+
+ * gui/e-meeting-time-sel.c (e_meeting_time_selector_style_set):
+ adjust row heights to reflect changes in etable row heights and
+ set display top to align properly
+
2003-05-22 JP Rosevear <jpr@ximian.com>
* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy): unref
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 94eabe7214..18e8fd76fe 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -305,7 +305,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
mts->meeting_positions_valid = FALSE;
- mts->row_height = 19;
+ mts->row_height = 17;
mts->col_width = 55;
mts->day_width = 55 * 24 + 1;
@@ -901,17 +901,16 @@ e_meeting_time_selector_style_set (GtkWidget *widget,
max_hour_width = MAX (max_hour_width, mts->hour_widths[hour]);
}
- /* FIXME the 5 is for the padding etable adds on */
- mts->row_height =
- PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
- PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)) + 5;
+ /* FIXME the 3 is for the padding etable adds on */
+ pango_layout_get_pixel_size (layout, NULL, &mts->row_height);
+ mts->row_height += 3;
mts->col_width = max_hour_width + 6;
e_meeting_time_selector_save_position (mts, &saved_time);
e_meeting_time_selector_recalc_grid (mts);
e_meeting_time_selector_restore_position (mts, &saved_time);
- gtk_widget_set_usize (mts->display_top, -1, mts->row_height * 3);
+ gtk_widget_set_usize (mts->display_top, -1, mts->row_height * 3 + 4);
/* Calculate header height */
real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (mts->etable));