brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extensions-app: Stop using :margin shortcut

Browse Source 
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>
This commit is contained in:
Florian Müllner 2020-04-15 20:27:15 +02:00 committed by Marge Bot
parent ad6fbaa245
commit 3af90918a3
3 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
subprojects/extensions-app/data/ui/extension-row.ui
View File

@ -8,7 +8,10 @@
<child> <child>
<object class="GtkGrid"> <object class="GtkGrid">
<property name="visible">True</property> <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> <property name="column-spacing">12</property>
<child> <child>
<object class="GtkLabel" id="nameLabel"> <object class="GtkLabel" id="nameLabel">

20
subprojects/extensions-app/data/ui/extensions-window.ui
View File

@ -19,7 +19,10 @@
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="orientation">vertical</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> <property name="spacing">6</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
@ -153,7 +156,10 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="halign">center</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> <property name="spacing">12</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
@ -215,7 +221,10 @@
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="orientation">vertical</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="spacing">6</property>
<property name="valign">center</property> <property name="valign">center</property>
<child> <child>
@ -286,7 +295,10 @@
<object class="GtkImage"> <object class="GtkImage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixel-size">24</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> <property name="icon-name">software-update-available-symbolic</property>
<style> <style>
<class name="warning"/> <class name="warning"/>

10
subprojects/extensions-app/js/main.js
View File

@ -152,7 +152,10 @@ var ExtensionsWindow = GObject.registerClass({
this._userList.set_filter_func(this._filterList.bind(this)); this._userList.set_filter_func(this._filterList.bind(this));
this._userList.set_placeholder(new Gtk.Label({ this._userList.set_placeholder(new Gtk.Label({
label: _('No Matches'), label: _('No Matches'),
margin: 12, margin_start: 12,
margin_end: 12,
margin_top: 12,
margin_bottom: 12,
visible: true, visible: true,
})); }));
@ -161,7 +164,10 @@ var ExtensionsWindow = GObject.registerClass({
this._systemList.set_filter_func(this._filterList.bind(this)); this._systemList.set_filter_func(this._filterList.bind(this));
this._systemList.set_placeholder(new Gtk.Label({ this._systemList.set_placeholder(new Gtk.Label({
label: _('No Matches'), label: _('No Matches'),
margin: 12, margin_start: 12,
margin_end: 12,
margin_top: 12,
margin_bottom: 12,
visible: true, visible: true,
})); }));