More fixes to positioning of gas / consumption information in info_frame

This gives the airconsumption label a fixed size and changes its alignment
so it is anchored to the right.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

diff --git a/info.c b/info.c
index d303a11370bd6e8faff51c4a99f7da158fe4a8ed..5cfe7286cb32ad406d945a8865c4019fd8bb1ac1 100644 (file)
--- a/info.c
+++ b/info.c
@@ -14,6 +14,9 @@ static GtkTextBuffer *notes;
 static int location_changed = 1, notes_changed = 1;
 static int divemaster_changed = 1, buddy_changed = 1;
 
+#define EMPTY_AIRCONSUMPTION " \n "
+#define AIRCON_WIDTH 20
+
 static const char *weekday(int wday)
 {
        static const char wday_array[7][4] = {
@@ -67,7 +70,8 @@ void show_dive_info(struct dive *dive)
        if (!dive) {
                gtk_label_set_text(GTK_LABEL(depth), "");
                gtk_label_set_text(GTK_LABEL(duration), "");
-               gtk_label_set_text(GTK_LABEL(airconsumption), "");
+               gtk_label_set_text(GTK_LABEL(airconsumption), EMPTY_AIRCONSUMPTION);
+               gtk_label_set_width_chars(GTK_LABEL(airconsumption), AIRCON_WIDTH);
                return;
        }
        /* dive number and location (or lacking that, the date) go in the window title */
@@ -183,6 +187,8 @@ GtkWidget *dive_info_frame(void)
        duration = info_label(hbox, "duration", GTK_JUSTIFY_RIGHT);
        temperature = info_label(hbox, "temperature", GTK_JUSTIFY_RIGHT);
        airconsumption = info_label(hbox, "air", GTK_JUSTIFY_RIGHT);
+       gtk_misc_set_alignment(GTK_MISC(airconsumption), 1.0, 0.5);
+       gtk_label_set_width_chars(GTK_LABEL(airconsumption), AIRCON_WIDTH);
 
        return frame;
 }