Merge branch 'fix-custom-paper-dialog' into 'master'

Fix the custom paper dialog

See merge request GNOME/gtk!2078
This commit is contained in:
Matthias Clasen 2020-06-12 14:01:17 +00:00
commit 07ecb3cb78

View File

@ -977,13 +977,13 @@ wrap_in_frame (const gchar *label,
g_free (bold_text);
frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_frame_set_child (GTK_FRAME (frame), label_widget);
gtk_box_append (GTK_BOX (frame), label_widget);
gtk_widget_set_margin_start (child, 12);
gtk_widget_set_halign (child, GTK_ALIGN_FILL);
gtk_widget_set_valign (child, GTK_ALIGN_FILL);
gtk_frame_set_child (GTK_FRAME (frame), child);
gtk_box_append (GTK_BOX (frame), child);
gtk_widget_show (frame);
@ -1020,6 +1020,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
gtk_widget_show (vbox);
scrolled = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_vexpand (scrolled, TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled), TRUE);