From: Dr. Johann Pfefferl Date: Wed, 26 May 2010 13:33:02 +0000 (+0200) Subject: Tried to fix the jumping data area X-Git-Tag: release-1.0-7~2 X-Git-Url: http://vcs.maemo.org/git/?p=gps-tracker;a=commitdiff_plain;h=4fbcdc0da4562aa3883b7c0e9f249b4e5b355889 Tried to fix the jumping data area --- diff --git a/gps-tracker.c b/gps-tracker.c index e79a0ad..f80ed4f 100644 --- a/gps-tracker.c +++ b/gps-tracker.c @@ -302,10 +302,13 @@ int main (int argc, char **argv) data->loc_hbox = (gpointer)gtk_hbox_new(FALSE, 0); data->loc_gps_data_table = (gpointer)gtk_table_new(4, 2, FALSE); { + GtkWidget *alignment_gps = gtk_alignment_new (0.5, 0.5, 1, 1); GtkWidget *lat_label = gtk_label_new("Lat:"); GtkWidget *lon_label = gtk_label_new("Lon:"); GtkWidget *alt_label = gtk_label_new("Alt:"); GtkWidget *sat_label = gtk_label_new("Sat:"); + + gtk_alignment_set_padding(GTK_ALIGNMENT(alignment_gps), 0,0,0,0); gtk_misc_set_alignment (GTK_MISC (lat_label), 1, 0.5); gtk_misc_set_alignment (GTK_MISC (lon_label), 1, 0.5); gtk_misc_set_alignment (GTK_MISC (alt_label), 1, 0.5); @@ -326,23 +329,23 @@ int main (int argc, char **argv) gtk_table_attach_defaults(data->loc_gps_data_table, data->lon_val_label, 1, 2, 1, 2); gtk_table_attach_defaults(data->loc_gps_data_table, data->alt_val_label, 1, 2, 2, 3); gtk_table_attach_defaults(data->loc_gps_data_table, data->sat_val_label, 1, 2, 3, 4); + data->loc_gps_data = hildon_caption_new(NULL, "", (gpointer)data->loc_gps_data_table, NULL, HILDON_CAPTION_MANDATORY); + //hildon_caption_set_label_alignment(data->loc_gps_data, 0); + //hildon_caption_set_separator((gpointer)data->loc_gps_data, " "); + hildon_caption_set_label_markup((gpointer)data->loc_gps_data, "GPS data"); + gtk_container_add (GTK_CONTAINER (alignment_gps), GTK_WIDGET(data->loc_gps_data)); + gtk_box_pack_start(GTK_BOX(data->loc_hbox), alignment_gps, TRUE, FALSE, 0); } - data->loc_gps_data = hildon_caption_new(NULL, "", (gpointer)data->loc_gps_data_table, NULL, HILDON_CAPTION_MANDATORY); - //hildon_caption_set_label_alignment(data->loc_gps_data, 0); - //hildon_caption_set_separator((gpointer)data->loc_gps_data, " "); - hildon_caption_set_label_markup((gpointer)data->loc_gps_data, "GPS data"); - gtk_box_pack_start(GTK_BOX(data->loc_hbox), GTK_WIDGET(data->loc_gps_data), TRUE, FALSE, 4); //gtk_box_pack_start(GTK_BOX(data->loc_hbox), gtk_vseparator_new(), TRUE, FALSE, 0); - data->loc_track_data_table = (gpointer)gtk_table_new(4, 2, FALSE); - data->loc_track_data = hildon_caption_new(NULL, "", (gpointer)data->loc_track_data_table, NULL, HILDON_CAPTION_MANDATORY); - //hildon_caption_set_label_alignment((gpointer)data->loc_track_data, 0); - hildon_caption_set_label_markup((gpointer)data->loc_track_data, "Track"); + data->loc_track_data_table = (gpointer)gtk_table_new(4, 2, TRUE); { + GtkWidget *alignment_track = gtk_alignment_new (0.5, 0.5, 1, 1); GtkWidget *speed_label = gtk_label_new("Speed:"); GtkWidget *track_label = gtk_label_new("Heading:"); GtkWidget *climb_label = gtk_label_new("Climb:"); + gtk_alignment_set_padding(GTK_ALIGNMENT(alignment_track), 0,0,0,0); gtk_misc_set_alignment (GTK_MISC (speed_label), 1, 0.5); gtk_misc_set_alignment (GTK_MISC (track_label), 1, 0.5); gtk_misc_set_alignment (GTK_MISC (climb_label), 1, 0.5); @@ -358,8 +361,12 @@ int main (int argc, char **argv) gtk_table_attach_defaults(data->loc_track_data_table, data->speed_val_label, 1, 2, 0, 1); gtk_table_attach_defaults(data->loc_track_data_table, data->track_val_label, 1, 2, 1, 2); gtk_table_attach_defaults(data->loc_track_data_table, data->climb_val_label, 1, 2, 2, 3); + data->loc_track_data = hildon_caption_new(NULL, "", (gpointer)data->loc_track_data_table, NULL, HILDON_CAPTION_MANDATORY); + //hildon_caption_set_label_alignment((gpointer)data->loc_track_data, 0); + hildon_caption_set_label_markup((gpointer)data->loc_track_data, "Track"); + gtk_container_add (GTK_CONTAINER (alignment_track), GTK_WIDGET(data->loc_track_data)); + gtk_box_pack_end(GTK_BOX(data->loc_hbox), alignment_track, TRUE, FALSE, 0); } - gtk_box_pack_end(GTK_BOX(data->loc_hbox), GTK_WIDGET(data->loc_track_data), TRUE, FALSE, 4); gtk_box_pack_start(GTK_BOX(data->main_vbox), GTK_WIDGET(data->loc_hbox), TRUE, FALSE, 0);