From 3af90918a3801f825152db152c211c9cdda74e6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 15 Apr 2020 20:27:15 +0200
Subject: [PATCH] extensions-app: Stop using :margin shortcut

The property has been removed in GTK4, so prepare for a port by
setting the four individual margin properties instead.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1495>
---
 .../extensions-app/data/ui/extension-row.ui   |  5 ++++-
 .../data/ui/extensions-window.ui              | 20 +++++++++++++++----
 subprojects/extensions-app/js/main.js         | 10 ++++++++--
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/subprojects/extensions-app/data/ui/extension-row.ui b/subprojects/extensions-app/data/ui/extension-row.ui
index 5aa18c4bb..ae24a75e1 100644
--- a/subprojects/extensions-app/data/ui/extension-row.ui
+++ b/subprojects/extensions-app/data/ui/extension-row.ui
@@ -8,7 +8,10 @@
     <child>
       <object class="GtkGrid">
         <property name="visible">True</property>
-        <property name="margin">12</property>
+        <property name="margin-start">12</property>
+        <property name="margin-end">12</property>
+        <property name="margin-top">12</property>
+        <property name="margin-bottom">12</property>
         <property name="column-spacing">12</property>
         <child>
           <object class="GtkLabel" id="nameLabel">
diff --git a/subprojects/extensions-app/data/ui/extensions-window.ui b/subprojects/extensions-app/data/ui/extensions-window.ui
index 265182a1d..dab66aa20 100644
--- a/subprojects/extensions-app/data/ui/extensions-window.ui
+++ b/subprojects/extensions-app/data/ui/extensions-window.ui
@@ -19,7 +19,10 @@
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
-        <property name="margin">12</property>
+        <property name="margin-start">12</property>
+        <property name="margin-end">12</property>
+        <property name="margin-top">12</property>
+        <property name="margin-bottom">12</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkLabel">
@@ -153,7 +156,10 @@
                         <property name="visible">True</property>
                         <property name="orientation">vertical</property>
                         <property name="halign">center</property>
-                        <property name="margin">36</property>
+                        <property name="margin-start">36</property>
+                        <property name="margin-end">36</property>
+                        <property name="margin-top">36</property>
+                        <property name="margin-bottom">36</property>
                         <property name="spacing">12</property>
                         <child>
                           <object class="GtkLabel">
@@ -215,7 +221,10 @@
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="orientation">vertical</property>
-                <property name="margin">32</property>
+                <property name="margin-start">32</property>
+                <property name="margin-end">32</property>
+                <property name="margin-top">32</property>
+                <property name="margin-bottom">32</property>
                 <property name="spacing">6</property>
                 <property name="valign">center</property>
                 <child>
@@ -286,7 +295,10 @@
               <object class="GtkImage">
                 <property name="visible">True</property>
                 <property name="pixel-size">24</property>
-                <property name="margin">6</property>
+                <property name="margin-start">6</property>
+                <property name="margin-end">6</property>
+                <property name="margin-top">6</property>
+                <property name="margin-bottom">6</property>
                 <property name="icon-name">software-update-available-symbolic</property>
                 <style>
                   <class name="warning"/>
diff --git a/subprojects/extensions-app/js/main.js b/subprojects/extensions-app/js/main.js
index 31a717df7..dc993ef96 100644
--- a/subprojects/extensions-app/js/main.js
+++ b/subprojects/extensions-app/js/main.js
@@ -152,7 +152,10 @@ var ExtensionsWindow = GObject.registerClass({
         this._userList.set_filter_func(this._filterList.bind(this));
         this._userList.set_placeholder(new Gtk.Label({
             label: _('No Matches'),
-            margin: 12,
+            margin_start: 12,
+            margin_end: 12,
+            margin_top: 12,
+            margin_bottom: 12,
             visible: true,
         }));
 
@@ -161,7 +164,10 @@ var ExtensionsWindow = GObject.registerClass({
         this._systemList.set_filter_func(this._filterList.bind(this));
         this._systemList.set_placeholder(new Gtk.Label({
             label: _('No Matches'),
-            margin: 12,
+            margin_start: 12,
+            margin_end: 12,
+            margin_top: 12,
+            margin_bottom: 12,
             visible: true,
         }));