X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgtk-custom-hruler.c;h=5f17ffe5834e8423372f8baaec5a4594fec53a68;hb=df7dae82cc0cc360baad8136c4ad18b97b9f8169;hp=671d1b68b4be0ed5d4bb939032c785f3af34679c;hpb=f69abbff90ac8b8426bb0c6e02a7f4d4a3fd5e6d;p=ardour.git

diff --git a/gtk2_ardour/gtk-custom-hruler.c b/gtk2_ardour/gtk-custom-hruler.c
index 671d1b68b4..5f17ffe583 100644
--- a/gtk2_ardour/gtk-custom-hruler.c
+++ b/gtk2_ardour/gtk-custom-hruler.c
@@ -21,7 +21,7 @@
  * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 /* modified by andreas meyer <hexx3000@gmx.de> */
@@ -44,12 +44,11 @@ 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 GType hruler_type = 0;
-	
-	if (!hruler_type)
-	{
+
+	if (!hruler_type) {
 		static const GTypeInfo hruler_info =
 			{
 				sizeof (GtkCustomHRulerClass),
@@ -61,12 +60,13 @@ guint gtk_custom_hruler_get_type (void)
 				sizeof (GtkCustomHRuler),
 				0,		/* n_preallocs */
 				(GInstanceInitFunc) gtk_custom_hruler_init,
+				NULL /* value_table */
 			};
-		
-		hruler_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkCustomHRuler",
-						      &hruler_info, 0);
+
+		hruler_type = g_type_register_static (gtk_custom_ruler_get_type(), "GtkCustomHRuler",
+						      &hruler_info, (GTypeFlags)0);
 	}
-	
+
 	return hruler_type;
 }
 
@@ -132,12 +132,15 @@ static void
 gtk_custom_hruler_draw_ticks (GtkCustomRuler * ruler)
 {
 	GtkWidget *widget;
-	GdkGC *gc, *bg_gc;
-	GdkFont *font;
+	GdkGC *gc;
 	gint i;
 	GtkCustomRulerMark *marks;
+	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));
@@ -148,23 +151,28 @@ gtk_custom_hruler_draw_ticks (GtkCustomRuler * ruler)
 	widget = GTK_WIDGET (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;
+
+	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);
 
-	gdk_draw_line (ruler->backing_store, gc, 0, widget->allocation.height - 1, 
+	gdk_draw_line (ruler->backing_store, gc, 0, widget->allocation.height - 1,
 		       widget->allocation.width, widget->allocation.height - 1);
 
 	if ((ruler->upper - ruler->lower) == 0) {
 		return;
 	}
-	
+
 	/* 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);
 
@@ -187,13 +195,27 @@ gtk_custom_hruler_draw_ticks (GtkCustomRuler * ruler)
 			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
@@ -226,10 +248,10 @@ gtk_custom_hruler_draw_pos (GtkCustomRuler * ruler)
 		if ((bs_width > 0) && (bs_height > 0)) {
 			/*  If a backing store exists, restore the ruler  */
 			if (ruler->backing_store && ruler->non_gr_exp_gc)
-				gdk_draw_pixmap (ruler->widget.window,
-						 ruler->non_gr_exp_gc,
-						 ruler->backing_store, ruler->xsrc, ruler->ysrc, ruler->xsrc, ruler->ysrc, bs_width, bs_height);
-			
+				gdk_draw_drawable (ruler->widget.window,
+                                                   ruler->non_gr_exp_gc,
+                                                   GDK_DRAWABLE(ruler->backing_store), ruler->xsrc, ruler->ysrc, ruler->xsrc, ruler->ysrc, bs_width, bs_height);
+
 			increment = (gfloat) width / (ruler->upper - ruler->lower);
 			x = ROUND ((ruler->position - ruler->lower) * increment) + (xthickness - bs_width) / 2 - 1;
 			y = (height + bs_height) / 2 + ythickness;