[balsa/gtk4: 156/314] Various: Fix margins

[Peter Bloomfield <peterb src gnome org>]

commit 2771a0e34aacc43da34a66d3ca225b4d61cf9fbd
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu Aug 27 11:27:47 2020 -0400

    Various: Fix margins

 libbalsa/libbalsa-gpgme-widgets.c        | 14 ++++++++++++--
 libinit_balsa/assistant_page_defclient.c |  3 +++
 2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/libbalsa/libbalsa-gpgme-widgets.c b/libbalsa/libbalsa-gpgme-widgets.c
index d4f0efbb5..77fdf8de4 100644
--- a/libbalsa/libbalsa-gpgme-widgets.c
+++ b/libbalsa/libbalsa-gpgme-widgets.c
@@ -218,13 +218,21 @@ libbalsa_gpgme_key(const gpgme_key_t     key,
                                /* if the signature is invalid, the fingerprint only the end of the subkey's 
fingerprint */
                                offs = strlen(subkey->fpr) - fingerprint_len;
                                if (strcmp(fingerprint, &subkey->fpr[offs]) == 0) {
-                                       gtk_box_pack_end(GTK_BOX(subkey_box), create_subkey_widget(subkey), 
FALSE, FALSE, 0);
+                                    GtkWidget *subkey_widget = create_subkey_widget(subkey);
+
+                                    gtk_widget_set_margin_top(subkey_widget, 2);
+                                    gtk_widget_set_margin_bottom(subkey_widget, 2);
+                                    gtk_box_pack_start(GTK_BOX(subkey_box), subkey_widget, FALSE, FALSE, 0);
                                }
                        } else if ((((subkey_capa & GPG_SUBKEY_CAP_SIGN) != 0U) && (subkey->can_sign != 0)) ||
                                           (((subkey_capa & GPG_SUBKEY_CAP_ENCRYPT) != 0U) && 
(subkey->can_encrypt != 0)) ||
                                           (((subkey_capa & GPG_SUBKEY_CAP_CERTIFY) != 0U) && 
(subkey->can_certify != 0)) ||
                                           (((subkey_capa & GPG_SUBKEY_CAP_AUTH) != 0U) && 
(subkey->can_authenticate != 0))) {
-                               gtk_box_pack_end(GTK_BOX(subkey_box), create_subkey_widget(subkey), FALSE, 
FALSE, 0);
+                            GtkWidget *subkey_widget = create_subkey_widget(subkey);
+
+                            gtk_widget_set_margin_top(subkey_widget, 2);
+                            gtk_widget_set_margin_bottom(subkey_widget, 2);
+                            gtk_box_pack_start(GTK_BOX(subkey_box), subkey_widget, FALSE, FALSE, 0);
                        } else {
                                /* do not print this subkey */
                        }
@@ -439,6 +447,8 @@ libbalsa_key_dialog(GtkWindow            *parent,
        scrolledw = gtk_scrolled_window_new(NULL, NULL);
         gtk_widget_set_vexpand(scrolledw, TRUE);
         gtk_widget_set_valign(scrolledw, GTK_ALIGN_FILL);
+        gtk_widget_set_margin_top(scrolledw, 6);
+        gtk_widget_set_margin_bottom(scrolledw, 6);
        gtk_container_add(GTK_CONTAINER(vbox), scrolledw);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledw), GTK_POLICY_NEVER, 
GTK_POLICY_AUTOMATIC);
        gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(scrolledw), 120);
diff --git a/libinit_balsa/assistant_page_defclient.c b/libinit_balsa/assistant_page_defclient.c
index 92c6b2f3c..cf0cf9c88 100644
--- a/libinit_balsa/assistant_page_defclient.c
+++ b/libinit_balsa/assistant_page_defclient.c
@@ -68,18 +68,21 @@ balsa_druid_page_defclient_init(BalsaDruidPageDefclient * defclient,
     gtk_widget_set_vexpand(widget, TRUE);
     gtk_widget_set_valign(widget, GTK_ALIGN_FILL);
     gtk_widget_set_margin_top(widget, 8);
+    gtk_widget_set_margin_bottom(widget, 8);
     gtk_box_pack_start(GTK_BOX(page), widget, FALSE, FALSE, 0);
 
     widget = GTK_WIDGET(yes);
     gtk_widget_set_vexpand(widget, TRUE);
     gtk_widget_set_valign(widget, GTK_ALIGN_FILL);
     gtk_widget_set_margin_top(widget, 2);
+    gtk_widget_set_margin_bottom(widget, 2);
     gtk_box_pack_start(GTK_BOX(page), widget, FALSE, FALSE, 0);
 
     widget = GTK_WIDGET(no);
     gtk_widget_set_vexpand(widget, TRUE);
     gtk_widget_set_valign(widget, GTK_ALIGN_FILL);
     gtk_widget_set_margin_top(widget, 2);
+    gtk_widget_set_margin_bottom(widget, 2);
     gtk_box_pack_start(GTK_BOX(page), widget, FALSE, FALSE, 0);
 
     return;