Re: [evolution-patches] 43308

[JP Rosevear <jpr ximian com>]

On Tue, 2003-05-20 at 14:46, JP Rosevear wrote:
> Should approximate the new e-table row heights calculation.

Allow me to attach the complete patch.

-JP
-- 
JP Rosevear <jpr ximian com>
Ximian, Inc.

? 41890.patch
? 43103.patch
? 43308.patch
? leak.patch
? utf8-title.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.1776
diff -u -r1.1776 ChangeLog
--- ChangeLog	20 May 2003 12:00:36 -0000	1.1776
+++ ChangeLog	20 May 2003 18:46:46 -0000
@@ -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-19  Dan Winship  <danw ximian com>
 
 	* pcs/cal-backend.c (cal_backend_finalize): Don't double-free
Index: gui/e-meeting-time-sel.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-time-sel.c,v
retrieving revision 1.49
diff -u -r1.49 e-meeting-time-sel.c
--- gui/e-meeting-time-sel.c	19 May 2003 16:24:32 -0000	1.49
+++ gui/e-meeting-time-sel.c	20 May 2003 18:46:47 -0000
@@ -306,7 +306,7 @@
 
 	mts->meeting_positions_valid = FALSE;
 
-	mts->row_height = 19;
+	mts->row_height = 17;
 	mts->col_width = 55;
 	mts->day_width = 55 * 24 + 1;
 
@@ -928,17 +928,16 @@
 		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));