Attachment 146534 Details for Bug 223210 – Patch to get to the screenshot in previous comment.

[patch] Patch to get to the screenshot in previous comment.

00_hour.patch (text/plain), 4.54 KB, created by Mayank Jain on 2007-01-25 12:47:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mayank Jain

Created: 2007-01-25 12:47:25 UTC

Size: 4.54 KB

patch

obsolete

>Index: calendar/gui/e-day-view-time-item.c
>===================================================================
>RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view-time-item.c,v
>retrieving revision 1.39
>diff -u -8 -p -r1.39 e-day-view-time-item.c
>--- calendar/gui/e-day-view-time-item.c	16 Oct 2006 18:13:49 -0000	1.39
>+++ calendar/gui/e-day-view-time-item.c	25 Jan 2007 12:45:53 -0000
>@@ -420,38 +420,33 @@ e_day_view_time_item_draw (GnomeCanvasIt
> 			} else {
> 				/* Within the hour - draw a short line before
> 				   the time. */
> 				gdk_draw_line (drawable, dark_gc,
> 					       short_line_x1, row_y,
> 					       long_line_x2, row_y);
> 			}
> 
>-			/* Normally we display the minute in each
>-			   interval, but when using 30-minute intervals
>-			   we don't display the '30'. */
>-			if (day_view->mins_per_row != 30 || minute != 30) {
>-				/* In 12-hour format we display 'am' or 'pm'
>-				   instead of '00'. */
>-				if (minute == 0
>-				    && !e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
>-					strcpy (buffer, suffix);
>-				} else {
>-					g_snprintf (buffer, sizeof (buffer),
>-						    "%02i", minute);
>-				}
>-
>-				layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer);
>-				pango_layout_get_pixel_size (layout, &minute_width, NULL);
>-				gdk_draw_layout (drawable, fg_gc,
>-						 minute_x2 - minute_width,
>-						 row_y + small_font_y_offset,
>-						 layout);
>-				g_object_unref (layout);
>+			/* In 12-hour format we display 'am' or 'pm'
>+			   instead of '00'. In 24 hr format, we display 00 and 30 */
>+			if (minute == 0
>+				&& !e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
>+				strcpy (buffer, suffix);
>+			} else {
>+				g_snprintf (buffer, sizeof (buffer),
>+						"%02i", minute);
> 			}
>+
>+			layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer);
>+			pango_layout_get_pixel_size (layout, &minute_width, NULL);
>+			gdk_draw_layout (drawable, fg_gc,
>+						minute_x2 - minute_width,
>+						row_y + small_font_y_offset,
>+						layout);
>+			g_object_unref (layout);
> 		}
> 
> 		e_day_view_time_item_increment_time (&hour, &minute,
> 						     day_view->mins_per_row);
> 	}
> 
> 	pango_font_metrics_unref (large_font_metrics);
> 	pango_font_metrics_unref (small_font_metrics);
>@@ -669,43 +664,38 @@ e_day_view_time_item_draw (GnomeCanvasIt
> 				gdk_cairo_set_source_color (cr, &dark);
> 				cairo_set_line_width (cr, 0.7);
> 				cairo_move_to (cr, short_line_x1, row_y);
> 				cairo_line_to (cr, long_line_x2, row_y);
> 				cairo_stroke (cr);
> 				cairo_restore (cr);
> 			}
> 
>-			/* Normally we display the minute in each
>-			   interval, but when using 30-minute intervals
>-			   we don't display the '30'. */
>-			if (day_view->mins_per_row != 30 || minute != 30) {
>-				/* In 12-hour format we display 'am' or 'pm'
>-				   instead of '00'. */
>-				if (minute == 0
>-				    && !e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
>-					strcpy (buffer, suffix);
>-				} else {
>-					g_snprintf (buffer, sizeof (buffer),
>-						    "%02i", minute);
>-				}
>+			/* In 12-hour format we display 'am' or 'pm'
>+			instead of '00'. In 24 hr format, we display 00 and 30*/
>+			if (minute == 0
>+				&& !e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
>+				strcpy (buffer, suffix);
>+			} else {
>+				g_snprintf (buffer, sizeof (buffer),
>+						"%02i", minute);
>+			}
> 
>-				cairo_save (cr);
>-				gdk_cairo_set_source_color (cr, &fg);
>-				layout = pango_cairo_create_layout (cr);
>-				pango_layout_set_text (layout, buffer, -1);
>-				pango_layout_set_font_description (layout, day_view->small_font_desc);
>-				pango_layout_get_pixel_size (layout, &minute_width, NULL);
>-				cairo_translate (cr, minute_x2 - minute_width, row_y + small_font_y_offset);
>-				pango_cairo_update_layout (cr, layout);
>-				pango_cairo_show_layout (cr, layout);
>-				cairo_restore (cr);
>+			cairo_save (cr);
>+			gdk_cairo_set_source_color (cr, &fg);
>+			layout = pango_cairo_create_layout (cr);
>+			pango_layout_set_text (layout, buffer, -1);
>+			pango_layout_set_font_description (layout, day_view->small_font_desc);
>+			pango_layout_get_pixel_size (layout, &minute_width, NULL);
>+			cairo_translate (cr, minute_x2 - minute_width, row_y + small_font_y_offset);
>+			pango_cairo_update_layout (cr, layout);
>+			pango_cairo_show_layout (cr, layout);
>+			cairo_restore (cr);
> 
>-				g_object_unref (layout);
>-			}
>+			g_object_unref (layout);
> 		}
> 
> 		e_day_view_time_item_increment_time (&hour, &minute,
> 						     day_view->mins_per_row);
> 	}
> 
> 	pango_font_metrics_unref (large_font_metrics);
> 	pango_font_metrics_unref (small_font_metrics);

Actions: View | Diff

Attachments on bug 223210: 145919 | 146529 | 146534