fix label alignments

src/browser.c

@@ -245,54 +245,60 @@ main (gint argc, gchar * argv[])
 
   w = gtk_label_new (NULL);
   gtk_label_set_markup (GTK_LABEL (w), _("<b>Name:</b>"));
-  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
 #if !GTK_CHECK_VERSION(3,0,0)
+  gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (t), w, 1, 2, 0, 1, GTK_FILL, 0, 0, 0);
 #else
+  gtk_label_set_xalign (GTK_LABEL (w), 0.0);
   gtk_grid_attach (GTK_GRID (t), w, 1, 0, 1, 1);
 #endif
   data->lname = gtk_label_new (NULL);
   gtk_label_set_selectable (GTK_LABEL (data->lname), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (data->lname), 0, 0.5);
 #if !GTK_CHECK_VERSION(3,0,0)
+  gtk_misc_set_alignment (GTK_MISC (data->lname), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (t), data->lname, 2, 3, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 #else
+  gtk_label_set_xalign (GTK_LABEL (data->lname), 0.0);
   gtk_grid_attach (GTK_GRID (t), data->lname, 2, 0, 1, 1);
   gtk_widget_set_hexpand (data->lname, TRUE);
 #endif
 
   w = gtk_label_new (NULL);
   gtk_label_set_markup (GTK_LABEL (w), _("<b>Sizes:</b>"));
-  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
 #if !GTK_CHECK_VERSION(3,0,0)
+  gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (t), w, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
 #else
+  gtk_label_set_xalign (GTK_LABEL (w), 0.0);
   gtk_grid_attach (GTK_GRID (t), w, 1, 1, 1, 1);
 #endif
   data->lsize = gtk_label_new (NULL);
   gtk_label_set_selectable (GTK_LABEL (data->lsize), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (data->lsize), 0, 0.5);
 #if !GTK_CHECK_VERSION(3,0,0)
+  gtk_misc_set_alignment (GTK_MISC (data->lsize), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (t), data->lsize, 2, 3, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 #else
+  gtk_label_set_xalign (GTK_LABEL (data->lsize), 0.0);
   gtk_grid_attach (GTK_GRID (t), data->lsize, 2, 1, 1, 1);
   gtk_widget_set_hexpand (data->lsize, TRUE);
 #endif
 
   w = gtk_label_new (NULL);
   gtk_label_set_markup (GTK_LABEL (w), _("<b>Filename:</b>"));
-  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
 #if !GTK_CHECK_VERSION(3,0,0)
+  gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (t), w, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
 #else
+  gtk_label_set_xalign (GTK_LABEL (w), 0.0);
   gtk_grid_attach (GTK_GRID (t), w, 1, 2, 1, 1);
 #endif
   data->lfile = gtk_label_new (NULL);
   gtk_label_set_selectable (GTK_LABEL (data->lfile), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (data->lfile), 0, 0.5);
 #if !GTK_CHECK_VERSION(3,0,0)
+  gtk_misc_set_alignment (GTK_MISC (data->lfile), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (t), data->lfile, 2, 3, 2, 3, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 #else
+  gtk_label_set_xalign (GTK_LABEL (data->lfile), 0.0);
   gtk_grid_attach (GTK_GRID (t), data->lfile, 2, 2, 1, 1);
   gtk_widget_set_hexpand (data->lfile, TRUE);
 #endif

src/form.c

@@ -743,10 +743,11 @@ form_create_widget (GtkWidget * dlg)
               else
                 gtk_label_set_text_with_mnemonic (GTK_LABEL (l), buf);
               gtk_widget_set_name (l, "yad-form-flabel");
-              gtk_misc_set_alignment (GTK_MISC (l), options.common_data.align, 0.5);
 #if !GTK_CHECK_VERSION(3,0,0)
+              gtk_misc_set_alignment (GTK_MISC (l), options.common_data.align, 0.5);
               gtk_table_attach (GTK_TABLE (tbl), l, col * 2, 1 + col * 2, row, row + 1, GTK_FILL, 0, 5, 5);
 #else
+              gtk_label_set_xalign (GTK_LABEL (l), options.common_data.align);
               gtk_grid_attach (GTK_GRID (tbl), l, col * 2, row, 1, 1);
 #endif
               g_free (buf);
@@ -1036,8 +1037,11 @@ form_create_widget (GtkWidget * dlg)
                     gtk_label_set_markup (GTK_LABEL (e), buf);
                   gtk_label_set_line_wrap (GTK_LABEL (e), TRUE);
                   gtk_label_set_selectable (GTK_LABEL (e), options.data.selectable_labels);
+#if !GTK_CHECK_VERSION(3,0,0)
                   gtk_misc_set_alignment (GTK_MISC (e), options.common_data.align, 0.5);
-                  //g_signal_connect_after (G_OBJECT (e), "size-allocate", G_CALLBACK (text_size_allocate_cb), NULL);
+#else
+                  gtk_label_set_xalign (GTK_LABEL (e), options.common_data.align);
+#endif
                   g_free (buf);
                 }
               else
@@ -1070,7 +1074,12 @@ form_create_widget (GtkWidget * dlg)
 #endif
 
                 l = gtk_label_new ("");
+
+#if !GTK_CHECK_VERSION(3,0,0)
                 gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
+#else
+                gtk_label_set_xalign (GTK_LABEL (l), 0.0);
+#endif
                 if (options.data.no_markup)
                   gtk_label_set_text (GTK_LABEL (l), ltxt);
                 else

src/html.c

@@ -244,7 +244,11 @@ open_cb (GtkWidget * w, gpointer d)
   cnt = gtk_dialog_get_content_area (GTK_DIALOG (dlg));
 
   lbl = gtk_label_new (_("Enter URI or file name:"));
-  gtk_misc_set_alignment (GTK_MISC (lbl), 0, 0);
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
+#else
+  gtk_label_set_xalign (GTK_LABEL (lbl), 0.0);
+#endif
   gtk_widget_show (lbl);
   gtk_box_pack_start (GTK_BOX (cnt), lbl, TRUE, FALSE, 2);
 
@@ -378,7 +382,7 @@ html_create_widget (GtkWidget * dlg)
 #else
   settings = webkit_web_settings_new ();
 #endif
-  
+
   g_object_set (G_OBJECT (settings), "user-agent", options.html_data.user_agent, NULL);
   if (options.html_data.user_style)
     {
@@ -405,7 +409,7 @@ html_create_widget (GtkWidget * dlg)
         g_signal_connect (view, "notify::title", G_CALLBACK (title_cb), dlg);
       if (strcmp (options.data.window_icon, "yad") == 0)
 #ifdef USE_WEBKIT2
-        g_signal_connect (view, "notify::favicon", G_CALLBACK (icon_cb), dlg);        
+        g_signal_connect (view, "notify::favicon", G_CALLBACK (icon_cb), dlg);
 #else
         g_signal_connect (view, "icon-loaded", G_CALLBACK (icon_cb), dlg);
 #endif

src/main.c

@@ -191,7 +191,12 @@ create_layout (GtkWidget *dlg)
         g_object_unref (pb);
 
       gtk_widget_set_name (image, "yad-dialog-image");
+#if !GTK_CHECK_VERSION(3,0,0)
       gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
+#else
+      gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (image, GTK_ALIGN_START);
+#endif
     }
 
   /* create text label */
@@ -214,22 +219,12 @@ create_layout (GtkWidget *dlg)
           gtk_label_set_selectable (GTK_LABEL (text), options.data.selectable_labels);
           gtk_label_set_justify (GTK_LABEL (text), options.data.text_align);
           gtk_widget_set_state (text, GTK_STATE_NORMAL);
-          switch (options.data.text_align)
-            {
-            case GTK_JUSTIFY_LEFT:
-            case GTK_JUSTIFY_FILL:
-              gtk_misc_set_alignment (GTK_MISC (text), 0.0, 0.5);
-              break;
-            case GTK_JUSTIFY_CENTER:
-              gtk_misc_set_alignment (GTK_MISC (text), 0.5, 0.5);
-              break;
-            case GTK_JUSTIFY_RIGHT:
-              gtk_misc_set_alignment (GTK_MISC (text), 1.0, 0.5);
-              break;
-            }
 #if !GTK_CHECK_VERSION(3,0,0)
+          gtk_misc_set_alignment (GTK_MISC (text), options.data.text_align, 0.5);
           if (!options.data.fixed)
             g_signal_connect (G_OBJECT (text), "size-allocate", G_CALLBACK (text_size_allocate_cb), NULL);
+#else
+          gtk_label_set_xalign (GTK_LABEL (text), options.data.text_align);
 #endif
         }
     }

src/multi-progress.c

@@ -105,7 +105,7 @@ handle_stdin (GIOChannel * channel, GIOCondition condition, gpointer data)
               else if (value[1] && b->type == YAD_PROGRESS_PERM)
                 {
                   guint id;
-                  
+
                   if (strncmp (value[1], "start", 5) == 0)
                     {
                       id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (pb), "id"));
@@ -122,8 +122,8 @@ handle_stdin (GIOChannel * channel, GIOCondition condition, gpointer data)
                         {
                           g_source_remove (id);
                           g_object_set_data (G_OBJECT (pb), "id", GINT_TO_POINTER (0));
-                        }                      
-                    }                    
+                        }
+                    }
                 }
               else
                 {
@@ -224,7 +224,11 @@ multi_progress_create_widget (GtkWidget * dlg)
         gtk_label_set_text (GTK_LABEL (l), p->name);
       else
         gtk_label_set_markup (GTK_LABEL (l), p->name);
+#if !GTK_CHECK_VERSION(3,0,0)
       gtk_misc_set_alignment (GTK_MISC (l), options.common_data.align, 0.5);
+#else
+      gtk_label_set_xalign (GTK_LABEL (l), options.common_data.align);
+#endif
       if (options.common_data.vertical)
 #if !GTK_CHECK_VERSION(3,0,0)
         gtk_table_attach (GTK_TABLE (table), l, i, i + 1, 1, 2, GTK_FILL, 0, 2, 2);

src/option.c

@@ -688,13 +688,13 @@ static gboolean
 set_text_align (const gchar * option_name, const gchar * value, gpointer data, GError ** err)
 {
   if (strcasecmp (value, "left") == 0)
-    options.data.text_align = GTK_JUSTIFY_LEFT;
+    options.data.text_align = 0.0;
   else if (strcasecmp (value, "right") == 0)
-    options.data.text_align = GTK_JUSTIFY_RIGHT;
+    options.data.text_align = 1.0;
   else if (strcasecmp (value, "center") == 0)
-    options.data.text_align = GTK_JUSTIFY_CENTER;
+    options.data.text_align = 0.5;
   else if (strcasecmp (value, "fill") == 0)
-    options.data.text_align = GTK_JUSTIFY_FILL;
+    options.data.text_align = 0.0;
   else
     g_printerr (_("Unknown align type: %s\n"), value);
 

src/print.c

@@ -315,7 +315,11 @@ yad_print_run (void)
             gtk_label_set_text (GTK_LABEL (lbl), buf);
           gtk_widget_set_name (lbl, "yad-dialog-label");
           gtk_label_set_selectable (GTK_LABEL (lbl), options.data.selectable_labels);
+#if !GTK_CHECK_VERSION(3,0,0)
           gtk_misc_set_alignment (GTK_MISC (lbl), options.data.text_align, 0.5);
+#else
+          gtk_label_set_xalign (GTK_LABEL (lbl), options.data.text_align);
+#endif
           if (options.data.geometry || options.data.width != -1)
             gtk_label_set_line_wrap (GTK_LABEL (lbl), TRUE);
           gtk_box_pack_start (GTK_BOX (box), lbl, TRUE, TRUE, 2);

src/util.c

@@ -52,7 +52,7 @@ read_settings (void)
 
   settings.print_settings = NULL;
   settings.page_setup = NULL;
-  
+
   settings.icon_theme = gtk_icon_theme_get_default ();
 
   filename = g_build_filename (g_get_user_config_dir (), YAD_SETTINGS_FILE, NULL);
@@ -392,8 +392,6 @@ get_label (gchar * str, guint border)
   if (gtk_stock_lookup (vals[0], &it))
     {
       l = gtk_label_new_with_mnemonic (it.label);
-      gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
-
       i = gtk_image_new_from_pixbuf (get_pixbuf (it.stock_id, YAD_SMALL_ICON));
     }
   else
@@ -405,12 +403,16 @@ get_label (gchar * str, guint border)
             gtk_label_set_markup_with_mnemonic (GTK_LABEL (l), vals[0]);
           else
             gtk_label_set_text_with_mnemonic (GTK_LABEL (l), vals[0]);
-          gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
         }
 
       if (vals[1] && *vals[1])
         i = gtk_image_new_from_pixbuf (get_pixbuf (vals[1], YAD_SMALL_ICON));
     }
+#if !GTK_CHECK_VERSION(3,0,0)
+  gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
+#else
+  gtk_label_set_xalign (GTK_LABEL (l), 0.0);
+#endif
 
   if (i)
     gtk_box_pack_start (GTK_BOX (t), i, FALSE, FALSE, 1);

src/yad.h

@@ -209,7 +209,7 @@ typedef struct {
   guint timeout;
   gchar *to_indicator;
   gchar *dialog_text;
-  GtkJustification text_align;
+  gdouble text_align;
   gchar *dialog_image;
   gboolean image_on_top;
   gchar *icon_theme;