From fad73c2c37cd9458da4cf88586e0fa1c099c6b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
Date: Sun, 17 Oct 2021 15:15:17 +0100
Subject: general: Stop setting GtkWidget:margin

This is also gone in GTK4, so we should set the margin for all 4 sides.

In batch-rename-dialog.ui there is a case where :margin was set to 0,
which is the default, so just remove the tag in that case.
---
 src/resources/ui/nautilus-batch-rename-dialog.ui     |  6 ++++--
 .../nautilus-file-properties-change-permissions.ui   |  5 ++++-
 src/resources/ui/nautilus-properties-window.ui       | 20 ++++++++++++++++----
 src/resources/ui/nautilus-search-popover.ui          |  5 ++++-
 src/resources/ui/nautilus-toolbar.ui                 |  5 ++++-
 5 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/resources/ui/nautilus-batch-rename-dialog.ui b/src/resources/ui/nautilus-batch-rename-dialog.ui
index 850458266..025628d9a 100644
--- a/src/resources/ui/nautilus-batch-rename-dialog.ui
+++ b/src/resources/ui/nautilus-batch-rename-dialog.ui
@@ -35,7 +35,6 @@
         <child>
           <object class="GtkGrid" id="grid">
             <property name="visible">True</property>
-            <property name="margin">0</property>
             <property name="row-spacing">6</property>
             <property name="column-spacing">6</property>
             <property name="hexpand">True</property>
@@ -48,7 +47,10 @@
                 <property name="visible">True</property>
                 <property name="hexpand">True</property>
                 <property name="halign">center</property>
-                <property name="margin">20</property>
+                <property name="margin-top">20</property>
+                <property name="margin-bottom">20</property>
+                <property name="margin-start">20</property>
+                <property name="margin-end">20</property>
                 <child>
                   <object class="GtkRadioButton" id="format_mode_button">
                     <property name="label" translatable="yes">Rename _using a template</property>
diff --git a/src/resources/ui/nautilus-file-properties-change-permissions.ui b/src/resources/ui/nautilus-file-properties-change-permissions.ui
index a35214c76..820df23f0 100644
--- a/src/resources/ui/nautilus-file-properties-change-permissions.ui
+++ b/src/resources/ui/nautilus-file-properties-change-permissions.ui
@@ -33,7 +33,10 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
-            <property name="margin">6</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">6</property>
+            <property name="margin-start">6</property>
+            <property name="margin-end">6</property>
             <property name="orientation">vertical</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
diff --git a/src/resources/ui/nautilus-properties-window.ui b/src/resources/ui/nautilus-properties-window.ui
index 4e68d6121..d34e0a238 100644
--- a/src/resources/ui/nautilus-properties-window.ui
+++ b/src/resources/ui/nautilus-properties-window.ui
@@ -29,7 +29,10 @@
               <object class="GtkBox" id="basic_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin">18</property>
+                <property name="margin-top">18</property>
+                <property name="margin-bottom">18</property>
+                <property name="margin-start">18</property>
+                <property name="margin-end">18</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
@@ -478,7 +481,10 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">False</property>
-                                <property name="margin">5</property>
+                                <property name="margin-top">5</property>
+                                <property name="margin-bottom">5</property>
+                                <property name="margin-start">5</property>
+                                <property name="margin-end">5</property>
                                 <property name="row_spacing">10</property>
                                 <property name="column_spacing">10</property>
                                 <child>
@@ -763,7 +769,10 @@
             <child>
               <object class="GtkBox" id="permissions_box">
                 <property name="can_focus">False</property>
-                <property name="margin">18</property>
+                <property name="margin-top">18</property>
+                <property name="margin-bottom">18</property>
+                <property name="margin-start">18</property>
+                <property name="margin-end">18</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkLabel" id="not_the_owner_label">
@@ -1273,7 +1282,10 @@
             <child>
               <object class="GtkBox" id="open_with_box">
                 <property name="can_focus">False</property>
-                <property name="margin">18</property>
+                <property name="margin-top">18</property>
+                <property name="margin-bottom">18</property>
+                <property name="margin-start">18</property>
+                <property name="margin-end">18</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
diff --git a/src/resources/ui/nautilus-search-popover.ui b/src/resources/ui/nautilus-search-popover.ui
index c4fad1e18..14bab0fd3 100644
--- a/src/resources/ui/nautilus-search-popover.ui
+++ b/src/resources/ui/nautilus-search-popover.ui
@@ -8,7 +8,10 @@
       <object class="GtkGrid" >
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin">20</property>
+        <property name="margin-top">20</property>
+        <property name="margin-bottom">20</property>
+        <property name="margin-start">20</property>
+        <property name="margin-end">20</property>
         <property name="row_spacing">8</property>
         <property name="column_spacing">18</property>
         <child>
diff --git a/src/resources/ui/nautilus-toolbar.ui b/src/resources/ui/nautilus-toolbar.ui
index ce91bcb2f..d012fa827 100644
--- a/src/resources/ui/nautilus-toolbar.ui
+++ b/src/resources/ui/nautilus-toolbar.ui
@@ -312,7 +312,10 @@
         <property name="width_request">160</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin">9</property>
+        <property name="margin-top">9</property>
+        <property name="margin-bottom">9</property>
+        <property name="margin-start">9</property>
+        <property name="margin-end">9</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkBox" id="view_menu_zoom_section">
-- 
cgit v1.2.1