From d33526071d473391ee861f1c725bb05eb52b2d3b Mon Sep 17 00:00:00 2001 From: Qball Cow Date: Thu, 2 Jul 2009 14:29:17 +0200 Subject: [PATCH] Refine text sizing, always select track --- src/gpx-viewer.c | 1 + src/speed-plot.vala | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gpx-viewer.c b/src/gpx-viewer.c index d8ac91d..73f7531 100644 --- a/src/gpx-viewer.c +++ b/src/gpx-viewer.c @@ -383,6 +383,7 @@ static void create_interface(void) lat2,lon2, FALSE); } + gtk_combo_box_set_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "routes_combo")), 0); } int main (int argc, char **argv) diff --git a/src/speed-plot.vala b/src/speed-plot.vala index 10c98a1..33f54b6 100644 --- a/src/speed-plot.vala +++ b/src/speed-plot.vala @@ -40,11 +40,14 @@ namespace Gpx override bool expose_event(Gdk.EventExpose event) { var ctx = Gdk.cairo_create(this.window); - stdout.printf("exose event\n"); + /* If no valid surface, render it */ if(surf == null) update_surface(this); + /* Draw the actual surface on the widget */ ctx.set_source_surface(this.surf, 0, 0); + Gdk.cairo_region(ctx, event.region); + ctx.clip(); ctx.paint(); return false; } @@ -72,7 +75,7 @@ namespace Gpx var layout = Pango.cairo_create_layout(ctx); double j =0.0; - double step_size = (graph_height)/10.0; + double step_size = (graph_height)/8.0; ctx.set_source_rgba(0.2, 0.2, 0.2, 0.6); ctx.set_line_width(1); for(j=graph_height;j>0.0;j-=step_size){ @@ -84,6 +87,7 @@ namespace Gpx /* Draw speed and ticks */ ctx.set_source_rgba(0.0, 0.0, 0.0, 1.0); double size = LEFT_OFFSET/("%.1f".printf(max_speed).length); + if(size > step_size) size = step_size; fd.set_absolute_size(size*1024); layout.set_font_description(fd); for(j=0;j