X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgtk-custom-hruler.c;h=1446fb487f15479922ff0d6f6839bb7a6a6e87f1;hb=9649a94053eda177086ac2930c7d172db3a2af11;hp=9c81ddf3b4a25723923da02896edb0033572f227;hpb=4b233612261e2d13ebbd1931f4d999c6da1451e9;p=ardour.git

diff --git a/gtk2_ardour/gtk-custom-hruler.c b/gtk2_ardour/gtk-custom-hruler.c
index 9c81ddf3b4..1446fb487f 100644
--- a/gtk2_ardour/gtk-custom-hruler.c
+++ b/gtk2_ardour/gtk-custom-hruler.c
@@ -44,24 +44,30 @@ static gint gtk_custom_hruler_motion_notify (GtkWidget * widget, GdkEventMotion
 static void gtk_custom_hruler_draw_ticks (GtkCustomRuler * ruler);
 static void gtk_custom_hruler_draw_pos (GtkCustomRuler * ruler);
 
-guint gtk_custom_hruler_get_type (void)
+GType gtk_custom_hruler_get_type (void)
 {
-	static guint custom_hruler_type = 0;
-
-	if (!custom_hruler_type) {
-		static const GtkTypeInfo custom_hruler_info = {
-			"GtkCustomHRuler",
-			sizeof (GtkCustomHRuler),
-			sizeof (GtkCustomHRulerClass),
-			(GtkClassInitFunc) gtk_custom_hruler_class_init,
-			(GtkObjectInitFunc) gtk_custom_hruler_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		custom_hruler_type = gtk_type_unique (gtk_custom_ruler_get_type (), &custom_hruler_info);
+	static GType hruler_type = 0;
+	
+	if (!hruler_type) {
+		static const GTypeInfo hruler_info =
+			{
+				sizeof (GtkCustomHRulerClass),
+				NULL,		/* base_init */
+				NULL,		/* base_finalize */
+				(GClassInitFunc) gtk_custom_hruler_class_init,
+				NULL,		/* class_finalize */
+				NULL,		/* class_data */
+				sizeof (GtkCustomHRuler),
+				0,		/* n_preallocs */
+				(GInstanceInitFunc) gtk_custom_hruler_init,
+				NULL /* value_table */
+			};
+		
+		hruler_type = g_type_register_static (gtk_custom_ruler_get_type(), "GtkCustomHRuler",
+						      &hruler_info, 0);
 	}
-	return custom_hruler_type;
+	
+	return hruler_type;
 }
 
 static void
@@ -127,11 +133,15 @@ gtk_custom_hruler_draw_ticks (GtkCustomRuler * ruler)
 {
 	GtkWidget *widget;
 	GdkGC *gc, *bg_gc;
-	GdkFont *font;
 	gint i;
 	GtkCustomRulerMark *marks;
+	gint xthickness;
+	gint ythickness;
 	gint nmarks;
 	gint max_chars;
+	gint digit_offset;
+	PangoLayout *layout;
+	PangoRectangle logical_rect, ink_rect;
 
 	g_return_if_fail (ruler != NULL);
 	g_return_if_fail (GTK_IS_CUSTOM_HRULER (ruler));
@@ -143,8 +153,15 @@ gtk_custom_hruler_draw_ticks (GtkCustomRuler * ruler)
 
 	gc = widget->style->fg_gc[GTK_STATE_NORMAL];
 	bg_gc = widget->style->bg_gc[GTK_STATE_NORMAL];
-	font = gtk_style_get_font(widget->style);
 	
+	layout = gtk_widget_create_pango_layout (widget, "012456789");
+	pango_layout_get_extents (layout, &ink_rect, &logical_rect);
+
+	digit_offset = ink_rect.y;
+
+	xthickness = widget->style->xthickness;
+	ythickness = widget->style->ythickness;
+
 	gtk_paint_box (widget->style, ruler->backing_store,
 		       GTK_STATE_NORMAL, GTK_SHADOW_NONE,
 		       NULL, widget, "custom_hruler", 0, 0, widget->allocation.width, widget->allocation.height);
@@ -158,7 +175,7 @@ gtk_custom_hruler_draw_ticks (GtkCustomRuler * ruler)
 	
 	/* we have to assume a fixed width font here */
 
-	max_chars = widget->allocation.width / gdk_string_width (font, "8");
+	max_chars = widget->allocation.width / 12; // XXX FIX ME: pixel with of the char `8'
 
 	nmarks = ruler->metric->get_marks (&marks, ruler->lower, ruler->upper, max_chars);
 
@@ -180,14 +197,28 @@ gtk_custom_hruler_draw_ticks (GtkCustomRuler * ruler)
 			gdk_draw_line (ruler->backing_store, gc, pos, height, pos, height - 3);
 			break;
 		}
-
-		gdk_draw_string (ruler->backing_store, font, gc, pos + 2, font->ascent - 1, marks[i].label);
+		
+		pango_layout_set_text (layout, marks[i].label, -1);
+		pango_layout_get_extents (layout, &logical_rect, NULL);
+		
+		gtk_paint_layout (widget->style,
+				  ruler->backing_store,
+				  GTK_WIDGET_STATE (widget),
+				  FALSE,
+				  NULL,
+				  widget,
+				  "hruler",
+				  pos + 2, ythickness + PANGO_PIXELS (logical_rect.y - digit_offset),
+				  layout);
+		
 		g_free (marks[i].label);
 	}
 	
 	if (nmarks) {
 		g_free (marks);
 	}
+	
+	g_object_unref (layout);
 }
 
 static void