[nautilus/wip/antoniof/reimagine-emblems: 18/19] grid-cell: Set extra margin in UI, not code

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

commit 8a50974788cc47ba11048679362abc9154a33e1b
Author: António Fernandes <antoniof gnome org>
Date:   Sat Jul 2 13:26:02 2022 +0100

    grid-cell: Set extra margin in UI, not code
    
    We have been setting this margin in code depending on icon size.
    
    But we are going to need this margin in all sizes in order to
    have space for emblems.

 src/nautilus-grid-cell.c               | 8 --------
 src/resources/ui/nautilus-grid-cell.ui | 2 ++
 2 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/src/nautilus-grid-cell.c b/src/nautilus-grid-cell.c
index 5e36d352d..41fb3d0fc 100644
--- a/src/nautilus-grid-cell.c
+++ b/src/nautilus-grid-cell.c
@@ -24,8 +24,6 @@ struct _NautilusGridCell
 
 G_DEFINE_TYPE (NautilusGridCell, nautilus_grid_cell, NAUTILUS_TYPE_VIEW_CELL)
 
-#define EXTRA_WIDTH_FOR_TEXT 36
-
 static void
 update_icon (NautilusGridCell *self)
 {
@@ -57,12 +55,6 @@ update_icon (NautilusGridCell *self)
     /* Set the same height and width for all icons regardless of aspect ratio.
      */
     gtk_widget_set_size_request (self->fixed_height_box, icon_size, icon_size);
-    if (icon_size < NAUTILUS_GRID_ICON_SIZE_EXTRA_LARGE)
-    {
-        int extra_margins = 0.5 * EXTRA_WIDTH_FOR_TEXT;
-        gtk_widget_set_margin_start (self->fixed_height_box, extra_margins);
-        gtk_widget_set_margin_end (self->fixed_height_box, extra_margins);
-    }
     style_context = gtk_widget_get_style_context (self->icon);
     thumbnail_path = nautilus_file_get_thumbnail_path (file);
     if (thumbnail_path != NULL &&
diff --git a/src/resources/ui/nautilus-grid-cell.ui b/src/resources/ui/nautilus-grid-cell.ui
index 2a9417aa8..1b98d2201 100644
--- a/src/resources/ui/nautilus-grid-cell.ui
+++ b/src/resources/ui/nautilus-grid-cell.ui
@@ -13,6 +13,8 @@
               <object class="GtkBox" id="fixed_height_box">
                 <property name="orientation">vertical</property>
                 <property name="halign">center</property>
+                <property name="margin-start">18</property>
+                <property name="margin-end">18</property>
                 <child>
                   <object class="AdwClamp">
                     <property name="maximum-size">0</property>