[nautilus/wip/antoniof/gtk4-preparation-batch-rename-dialog: 3/5] batch-rename-dialog: Don't add separator above first row

[António Fernandes <antoniof src gnome org>]

commit 68eaecb4bf31bc34b7f2f70fa95b286adbdeea7e
Author: António Fernandes <antoniof gnome org>
Date:   Sat Aug 14 11:12:31 2021 +0100

    batch-rename-dialog: Don't add separator above first row
    
    It doesn't look good.

 src/nautilus-batch-rename-dialog.c | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)
---
diff --git a/src/nautilus-batch-rename-dialog.c b/src/nautilus-batch-rename-dialog.c
index b223f4e64..87ad3eb0b 100644
--- a/src/nautilus-batch-rename-dialog.c
+++ b/src/nautilus-batch-rename-dialog.c
@@ -490,15 +490,18 @@ listbox_header_func (GtkListBoxRow             *row,
                      GtkListBoxRow             *before,
                      NautilusBatchRenameDialog *dialog)
 {
-    gboolean show_separator;
+    GtkWidget *separator;
 
-    show_separator = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row),
-                                                         "show-separator"));
-
-    if (show_separator)
+    if (before == NULL)
     {
-        GtkWidget *separator;
+        /* First row needs no separator */
+        gtk_list_box_row_set_header (row, NULL);
+        return;
+    }
 
+    separator = gtk_list_box_row_get_header (row);
+    if (separator == NULL)
+    {
         separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
         gtk_widget_show (separator);
 
@@ -577,16 +580,13 @@ update_rows_height (NautilusBatchRenameDialog *dialog)
 
 static GtkWidget *
 create_original_name_row_for_label (NautilusBatchRenameDialog *dialog,
-                                    const gchar               *old_text,
-                                    gboolean                   show_separator)
+                                    const gchar               *old_text)
 {
     GtkWidget *row;
     GtkWidget *label_old;
 
     row = gtk_list_box_row_new ();
 
-    g_object_set_data (G_OBJECT (row), "show-separator", GINT_TO_POINTER (show_separator));
-
     label_old = gtk_label_new (old_text);
     gtk_label_set_xalign (GTK_LABEL (label_old), 0.0);
     gtk_widget_set_hexpand (label_old, TRUE);
@@ -603,16 +603,13 @@ create_original_name_row_for_label (NautilusBatchRenameDialog *dialog,
 
 static GtkWidget *
 create_result_row_for_label (NautilusBatchRenameDialog *dialog,
-                             const gchar               *new_text,
-                             gboolean                   show_separator)
+                             const gchar               *new_text)
 {
     GtkWidget *row;
     GtkWidget *label_new;
 
     row = gtk_list_box_row_new ();
 
-    g_object_set_data (G_OBJECT (row), "show-separator", GINT_TO_POINTER (show_separator));
-
     label_new = gtk_label_new (new_text);
     gtk_label_set_xalign (GTK_LABEL (label_new), 0.0);
     gtk_widget_set_hexpand (label_new, TRUE);
@@ -628,16 +625,13 @@ create_result_row_for_label (NautilusBatchRenameDialog *dialog,
 }
 
 static GtkWidget *
-create_arrow_row_for_label (NautilusBatchRenameDialog *dialog,
-                            gboolean                   show_separator)
+create_arrow_row_for_label (NautilusBatchRenameDialog *dialog)
 {
     GtkWidget *row;
     GtkWidget *icon;
 
     row = gtk_list_box_row_new ();
 
-    g_object_set_data (G_OBJECT (row), "show-separator", GINT_TO_POINTER (show_separator));
-
     if (gtk_widget_get_direction (row) == GTK_TEXT_DIR_RTL)
     {
         icon = gtk_label_new ("←");
@@ -739,17 +733,17 @@ fill_display_listbox (NautilusBatchRenameDialog *dialog)
         new_name = l1->data;
 
         name = nautilus_file_get_name (file);
-        row = create_original_name_row_for_label (dialog, name, TRUE);
+        row = create_original_name_row_for_label (dialog, name);
         gtk_container_add (GTK_CONTAINER (dialog->original_name_listbox), row);
         dialog->original_name_listbox_rows = g_list_prepend (dialog->original_name_listbox_rows,
                                                              row);
 
-        row = create_arrow_row_for_label (dialog, TRUE);
+        row = create_arrow_row_for_label (dialog);
         gtk_container_add (GTK_CONTAINER (dialog->arrow_listbox), row);
         dialog->arrow_listbox_rows = g_list_prepend (dialog->arrow_listbox_rows,
                                                      row);
 
-        row = create_result_row_for_label (dialog, new_name->str, TRUE);
+        row = create_result_row_for_label (dialog, new_name->str);
         gtk_container_add (GTK_CONTAINER (dialog->result_listbox), row);
         dialog->result_listbox_rows = g_list_prepend (dialog->result_listbox_rows,
                                                       row);