[gtk+] Replace all margin-left and margin-right with margin-start and margin-end
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Replace all margin-left and margin-right with margin-start and margin-end
- Date: Fri, 15 Nov 2013 01:57:57 +0000 (UTC)
commit 719dd636a9da679ea08a9644a8cccfe7d6f145d7
Author: Yosef Or Boczko <yoseforb gmail com>
Date: Fri Nov 15 00:31:17 2013 +0200
Replace all margin-left and margin-right with margin-start and margin-end
https://bugzilla.gnome.org/show_bug.cgi?id=710238
demos/gtk-demo/listbox.ui | 4 +-
demos/gtk-demo/overlay.c | 32 +++++++++---------
demos/widget-factory/widget-factory.ui | 4 +-
gtk/deprecated/gtktable.c | 4 +-
gtk/gtkcoloreditor.ui | 16 ++++----
gtk/gtkcustompaperunixdialog.c | 2 +-
gtk/gtkfontchooserwidget.ui | 4 +-
gtk/gtkoverlay.c | 4 +-
gtk/gtkprintunixdialog.ui | 14 ++++----
gtk/gtkstatusbar.ui | 4 +-
gtk/gtkstatusicon.c | 4 +-
gtk/gtkstylecontext.c | 13 ++++---
gtk/gtktooltip.c | 4 +-
tests/testadjustsize.c | 4 +-
tests/testgtk.c | 8 ++--
tests/testoverlaystyleclass.c | 2 +-
tests/testrevealer.c | 8 ++--
tests/visuals/osd-toolbars.ui | 8 ++--
testsuite/reftests/alignment-props.ui | 12 +++---
testsuite/reftests/inherit-and-initial.ref.ui | 4 +-
testsuite/reftests/inherit-and-initial.ui | 4 +-
testsuite/reftests/misc-alignment.ui | 36 ++++++++++----------
.../sizegroups-evolution-identity-page.ref.ui | 12 +++---
.../reftests/sizegroups-evolution-identity-page.ui | 12 +++---
24 files changed, 111 insertions(+), 108 deletions(-)
---
diff --git a/demos/gtk-demo/listbox.ui b/demos/gtk-demo/listbox.ui
index 1d42601..b9423f2 100644
--- a/demos/gtk-demo/listbox.ui
+++ b/demos/gtk-demo/listbox.ui
@@ -38,8 +38,8 @@
<property name="valign">start</property>
<property name="margin_top">8</property>
<property name="margin_bottom">8</property>
- <property name="margin_left">8</property>
- <property name="margin_right">8</property>
+ <property name="margin_start">8</property>
+ <property name="margin_end">8</property>
<property name="icon-name">image-missing</property>
</object>
<packing>
diff --git a/demos/gtk-demo/overlay.c b/demos/gtk-demo/overlay.c
index b291ac1..60f419f 100644
--- a/demos/gtk-demo/overlay.c
+++ b/demos/gtk-demo/overlay.c
@@ -51,8 +51,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_END);
gtk_widget_set_valign (label, GTK_ALIGN_END);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
- gtk_widget_set_margin_left (label, 20);
- gtk_widget_set_margin_right (label, 20);
+ gtk_widget_set_margin_start (label, 20);
+ gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5);
@@ -65,8 +65,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_END);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
- gtk_widget_set_margin_left (label, 20);
- gtk_widget_set_margin_right (label, 20);
+ gtk_widget_set_margin_start (label, 20);
+ gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5);
@@ -79,8 +79,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_END);
gtk_widget_set_valign (label, GTK_ALIGN_START);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
- gtk_widget_set_margin_left (label, 20);
- gtk_widget_set_margin_right (label, 20);
+ gtk_widget_set_margin_start (label, 20);
+ gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5);
@@ -93,8 +93,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_START);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
- gtk_widget_set_margin_left (label, 20);
- gtk_widget_set_margin_right (label, 20);
+ gtk_widget_set_margin_start (label, 20);
+ gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5);
@@ -107,8 +107,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_END);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
- gtk_widget_set_margin_left (label, 20);
- gtk_widget_set_margin_right (label, 20);
+ gtk_widget_set_margin_start (label, 20);
+ gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5);
@@ -121,8 +121,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
- gtk_widget_set_margin_left (label, 20);
- gtk_widget_set_margin_right (label, 20);
+ gtk_widget_set_margin_start (label, 20);
+ gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5);
@@ -135,8 +135,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
gtk_widget_set_valign (label, GTK_ALIGN_START);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
- gtk_widget_set_margin_left (label, 20);
- gtk_widget_set_margin_right (label, 20);
+ gtk_widget_set_margin_start (label, 20);
+ gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5);
@@ -149,8 +149,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
gtk_widget_set_valign (label, GTK_ALIGN_END);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
- gtk_widget_set_margin_left (label, 10);
- gtk_widget_set_margin_right (label, 10);
+ gtk_widget_set_margin_start (label, 10);
+ gtk_widget_set_margin_end (label, 10);
gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5);
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 8512505..b043d6b 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1756,8 +1756,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
<property name="visible">True</property>
<property name="margin-top">10</property>
<property name="margin-bottom">10</property>
- <property name="margin-left">10</property>
- <property name="margin-right">10</property>
+ <property name="margin-start">10</property>
+ <property name="margin-end">10</property>
<property name="spacing">20</property>
<child>
<object class="GtkLabel" id="page2note">
diff --git a/gtk/deprecated/gtktable.c b/gtk/deprecated/gtktable.c
index 9191bc3..774d0d1 100644
--- a/gtk/deprecated/gtktable.c
+++ b/gtk/deprecated/gtktable.c
@@ -897,8 +897,8 @@ gtk_table_get_row_spacing (GtkTable *table,
* Alters the amount of space between a given table column and the following
* column.
*
- * Deprecated: 3.4: Use gtk_widget_set_margin_left() and
- * gtk_widget_set_margin_right() on the widgets contained in the row if
+ * Deprecated: 3.4: Use gtk_widget_set_margin_start() and
+ * gtk_widget_set_margin_end() on the widgets contained in the row if
* you need this functionality. #GtkGrid does not support per-row spacing.
*/
void
diff --git a/gtk/gtkcoloreditor.ui b/gtk/gtkcoloreditor.ui
index bfd3e1a..3f4a9fc 100644
--- a/gtk/gtkcoloreditor.ui
+++ b/gtk/gtkcoloreditor.ui
@@ -38,8 +38,8 @@
<object class="GtkGrid" id="grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">30</property>
- <property name="margin_right">30</property>
+ <property name="margin_start">30</property>
+ <property name="margin_end">30</property>
<property name="row_spacing">12</property>
<property name="column_spacing">12</property>
<child>
@@ -157,8 +157,8 @@
<object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="margin_right">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">6</property>
@@ -215,8 +215,8 @@
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="margin_right">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">6</property>
@@ -273,8 +273,8 @@
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="margin_right">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="row_spacing">6</property>
diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index 713bb7e..6898f6f 100644
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -963,7 +963,7 @@ wrap_in_frame (const gchar *label,
frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE, 0);
- gtk_widget_set_margin_left (child, 12);
+ gtk_widget_set_margin_start (child, 12);
gtk_widget_set_halign (child, GTK_ALIGN_FILL);
gtk_widget_set_valign (child, GTK_ALIGN_FILL);
diff --git a/gtk/gtkfontchooserwidget.ui b/gtk/gtkfontchooserwidget.ui
index dd6a12e..c12bdab 100644
--- a/gtk/gtkfontchooserwidget.ui
+++ b/gtk/gtkfontchooserwidget.ui
@@ -113,8 +113,8 @@
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">start</property>
- <property name="margin_left">12</property>
- <property name="margin_right">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="label" translatable="yes">No fonts matched your search. You can revise your
search and try again.</property>
diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c
index 59a8fa7..3fae8a1 100644
--- a/gtk/gtkoverlay.c
+++ b/gtk/gtkoverlay.c
@@ -104,8 +104,8 @@ gtk_overlay_compute_child_allocation (GtkOverlay *overlay,
/* put the margins outside the window; also arrange things
* so that the adjusted child allocation still ends up at 0, 0
*/
- left = gtk_widget_get_margin_left (child->widget);
- right = gtk_widget_get_margin_right (child->widget);
+ left = gtk_widget_get_margin_start (child->widget);
+ right = gtk_widget_get_margin_end (child->widget);
top = gtk_widget_get_margin_top (child->widget);
bottom = gtk_widget_get_margin_bottom (child->widget);
diff --git a/gtk/gtkprintunixdialog.ui b/gtk/gtkprintunixdialog.ui
index c4c6513..0a0530a 100644
--- a/gtk/gtkprintunixdialog.ui
+++ b/gtk/gtkprintunixdialog.ui
@@ -268,7 +268,7 @@
<object class="GtkGrid" id="range_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
@@ -415,7 +415,7 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
@@ -575,7 +575,7 @@
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
@@ -811,7 +811,7 @@
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
@@ -1080,7 +1080,7 @@
<object class="GtkGrid" id="grid5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
@@ -1189,7 +1189,7 @@
<object class="GtkGrid" id="grid6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
@@ -1328,7 +1328,7 @@
<object class="GtkGrid" id="grid7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
diff --git a/gtk/gtkstatusbar.ui b/gtk/gtkstatusbar.ui
index 94c7f67..c506b9b 100644
--- a/gtk/gtkstatusbar.ui
+++ b/gtk/gtkstatusbar.ui
@@ -5,8 +5,8 @@
<property name="can_focus">False</property>
<property name="vexpand">False</property>
<property name="spacing">2</property>
- <property name="margin_left">10</property>
- <property name="margin_right">10</property>
+ <property name="margin_start">10</property>
+ <property name="margin_end">10</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<child>
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 3363bb3..1168a83 100644
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -1469,8 +1469,8 @@ gtk_status_icon_padding_changed (GtkStatusIcon *status_icon)
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
- gtk_widget_set_margin_left (priv->image, padding);
- gtk_widget_set_margin_right (priv->image, padding);
+ gtk_widget_set_margin_start (priv->image, padding);
+ gtk_widget_set_margin_end (priv->image, padding);
}
else
{
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 9f35f42..d883c9f 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -3634,23 +3634,26 @@ gtk_style_context_get_margin (GtkStyleContext *context,
GtkStateFlags state,
GtkBorder *margin)
{
- int top, left, bottom, right;
+ int top, start, bottom, end;
+ gboolean rtl;
g_return_if_fail (margin != NULL);
g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
+ rtl = (gtk_style_context_get_state (context) & GTK_STATE_FLAG_DIR_RTL);
+
gtk_style_context_get (context,
state,
"margin-top", &top,
- "margin-left", &left,
+ "margin-start", &start,
"margin-bottom", &bottom,
- "margin-right", &right,
+ "margin-end", &end,
NULL);
margin->top = top;
- margin->left = left;
+ margin->left = rtl ? start : end;
margin->bottom = bottom;
- margin->right = right;
+ margin->right = rtl ? end : start;
}
/**
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 7d8a6c5..71b9964 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -240,8 +240,8 @@ gtk_tooltip_init (GtkTooltip *tooltip)
/* FIXME: don't hardcode the padding */
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
- gtk_widget_set_margin_left (box, 6);
- gtk_widget_set_margin_right (box, 6);
+ gtk_widget_set_margin_start (box, 6);
+ gtk_widget_set_margin_end (box, 6);
gtk_widget_set_margin_top (box, 6);
gtk_widget_set_margin_bottom (box, 6);
gtk_container_add (GTK_CONTAINER (window), box);
diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c
index d3dccda..8b72441 100644
--- a/tests/testadjustsize.c
+++ b/tests/testadjustsize.c
@@ -354,8 +354,8 @@ open_margin_window (void)
GtkWidget *box;
int i;
const char * margins[] = {
- "margin-left",
- "margin-right",
+ "margin-start",
+ "margin-end",
"margin-top",
"margin-bottom",
"margin"
diff --git a/tests/testgtk.c b/tests/testgtk.c
index ddc2ca0..11fcf17 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -6020,8 +6020,8 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
g_object_set_data (G_OBJECT (child), "tab_pixmap", pixwid);
gtk_box_pack_start (GTK_BOX (label_box), pixwid, FALSE, TRUE, 0);
- gtk_widget_set_margin_left (pixwid, 3);
- gtk_widget_set_margin_right (pixwid, 3);
+ gtk_widget_set_margin_start (pixwid, 3);
+ gtk_widget_set_margin_end (pixwid, 3);
gtk_widget_set_margin_bottom (pixwid, 1);
gtk_widget_set_margin_top (pixwid, 1);
label = gtk_label_new_with_mnemonic (accel_buffer);
@@ -6034,8 +6034,8 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
g_object_set_data (G_OBJECT (child), "menu_pixmap", pixwid);
gtk_box_pack_start (GTK_BOX (menu_box), pixwid, FALSE, TRUE, 0);
- gtk_widget_set_margin_left (pixwid, 3);
- gtk_widget_set_margin_right (pixwid, 3);
+ gtk_widget_set_margin_start (pixwid, 3);
+ gtk_widget_set_margin_end (pixwid, 3);
gtk_widget_set_margin_bottom (pixwid, 1);
gtk_widget_set_margin_top (pixwid, 1);
label = gtk_label_new (buffer);
diff --git a/tests/testoverlaystyleclass.c b/tests/testoverlaystyleclass.c
index 911050e..161fd6c 100644
--- a/tests/testoverlaystyleclass.c
+++ b/tests/testoverlaystyleclass.c
@@ -116,7 +116,7 @@ main (int argc, char *argv[])
str = g_strdup_printf ("%p", child);
gtk_label_set_text (GTK_LABEL (child), str);
g_free (str);
- gtk_widget_set_margin_left (child, 55);
+ gtk_widget_set_margin_start (child, 55);
gtk_widget_set_margin_top (child, 4);
g_print ("Left/Top margined child: %p\n", child);
gtk_widget_set_halign (child, GTK_ALIGN_START);
diff --git a/tests/testrevealer.c b/tests/testrevealer.c
index 3eab9cd..2de4c57 100644
--- a/tests/testrevealer.c
+++ b/tests/testrevealer.c
@@ -17,15 +17,15 @@ main (gint argc,
widget = gtk_label_new ("Some filler text to avoid\nresizing of the window");
gtk_widget_set_margin_top (widget, 10);
gtk_widget_set_margin_bottom (widget, 10);
- gtk_widget_set_margin_left (widget, 10);
- gtk_widget_set_margin_right (widget, 10);
+ gtk_widget_set_margin_start (widget, 10);
+ gtk_widget_set_margin_end (widget, 10);
gtk_grid_attach (GTK_GRID (box), widget, 1, 1, 1, 1);
widget = gtk_label_new ("Some filler text to avoid\nresizing of the window");
gtk_widget_set_margin_top (widget, 10);
gtk_widget_set_margin_bottom (widget, 10);
- gtk_widget_set_margin_left (widget, 10);
- gtk_widget_set_margin_right (widget, 10);
+ gtk_widget_set_margin_start (widget, 10);
+ gtk_widget_set_margin_end (widget, 10);
gtk_grid_attach (GTK_GRID (box), widget, 3, 3, 1, 1);
widget = gtk_toggle_button_new_with_label ("None");
diff --git a/tests/visuals/osd-toolbars.ui b/tests/visuals/osd-toolbars.ui
index ec4d8ea..3ac7df6 100644
--- a/tests/visuals/osd-toolbars.ui
+++ b/tests/visuals/osd-toolbars.ui
@@ -104,8 +104,8 @@
<object class="GtkLabel" id="status_label">
<property name="visible">True</property>
<property name="label">OSD Toolbar</property>
- <property name="margin_left">10</property>
- <property name="margin_right">10</property>
+ <property name="margin_start">10</property>
+ <property name="margin_end">10</property>
</object>
</child>
</object>
@@ -204,8 +204,8 @@
<object class="GtkLabel" id="tb5_label">
<property name="visible">True</property>
<property name="label">Another kind of OSD toolbar</property>
- <property name="margin_left">10</property>
- <property name="margin_right">10</property>
+ <property name="margin_start">10</property>
+ <property name="margin_end">10</property>
</object>
</child>
</object>
diff --git a/testsuite/reftests/alignment-props.ui b/testsuite/reftests/alignment-props.ui
index 40415a3..08acf68 100644
--- a/testsuite/reftests/alignment-props.ui
+++ b/testsuite/reftests/alignment-props.ui
@@ -79,8 +79,8 @@
<property name="vexpand">True</property>
<property name="margin-top">10</property>
<property name="margin-bottom">30</property>
- <property name="margin-left">20</property>
- <property name="margin-right">40</property>
+ <property name="margin-start">20</property>
+ <property name="margin-end">40</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -100,8 +100,8 @@
<property name="vexpand">True</property>
<property name="margin-top">10</property>
<property name="margin-bottom">30</property>
- <property name="margin-left">20</property>
- <property name="margin-right">40</property>
+ <property name="margin-start">20</property>
+ <property name="margin-end">40</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -121,8 +121,8 @@
<property name="vexpand">True</property>
<property name="margin-top">10</property>
<property name="margin-bottom">30</property>
- <property name="margin-left">20</property>
- <property name="margin-right">40</property>
+ <property name="margin-start">20</property>
+ <property name="margin-end">40</property>
</object>
<packing>
<property name="left_attach">2</property>
diff --git a/testsuite/reftests/inherit-and-initial.ref.ui b/testsuite/reftests/inherit-and-initial.ref.ui
index 9c6a93b..d954396 100644
--- a/testsuite/reftests/inherit-and-initial.ref.ui
+++ b/testsuite/reftests/inherit-and-initial.ref.ui
@@ -1771,8 +1771,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
<property name="name">inherit</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">5</property>
- <property name="margin_right">5</property>
+ <property name="margin_start">5</property>
+ <property name="margin_end">5</property>
<property name="margin_bottom">5</property>
<property name="spacing">10</property>
<property name="homogeneous">True</property>
diff --git a/testsuite/reftests/inherit-and-initial.ui b/testsuite/reftests/inherit-and-initial.ui
index 7b9dc0a..be81c8f 100644
--- a/testsuite/reftests/inherit-and-initial.ui
+++ b/testsuite/reftests/inherit-and-initial.ui
@@ -1643,8 +1643,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
<object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">5</property>
- <property name="margin_right">5</property>
+ <property name="margin_start">5</property>
+ <property name="margin_end">5</property>
<property name="margin_bottom">5</property>
<property name="spacing">10</property>
<property name="homogeneous">True</property>
diff --git a/testsuite/reftests/misc-alignment.ui b/testsuite/reftests/misc-alignment.ui
index a6e2b63..622b850 100644
--- a/testsuite/reftests/misc-alignment.ui
+++ b/testsuite/reftests/misc-alignment.ui
@@ -30,8 +30,8 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">10</property>
- <property name="margin_right">10</property>
+ <property name="margin_start">10</property>
+ <property name="margin_end">10</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="halign">start</property>
@@ -51,8 +51,8 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">20</property>
- <property name="margin_right">20</property>
+ <property name="margin_start">20</property>
+ <property name="margin_end">20</property>
<property name="margin_top">20</property>
<property name="margin_bottom">20</property>
<property name="halign">center</property>
@@ -72,8 +72,8 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">10</property>
- <property name="margin_right">10</property>
+ <property name="margin_start">10</property>
+ <property name="margin_end">10</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="halign">end</property>
@@ -126,8 +126,8 @@
<object class="GtkArrow" id="arrow2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">10</property>
- <property name="margin_right">10</property>
+ <property name="margin_start">10</property>
+ <property name="margin_end">10</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="halign">start</property>
@@ -147,8 +147,8 @@
<property name="width_request">16</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">20</property>
- <property name="margin_right">20</property>
+ <property name="margin_start">20</property>
+ <property name="margin_end">20</property>
<property name="margin_top">20</property>
<property name="margin_bottom">20</property>
<property name="halign">center</property>
@@ -167,8 +167,8 @@
<object class="GtkArrow" id="arrow4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">10</property>
- <property name="margin_right">10</property>
+ <property name="margin_start">10</property>
+ <property name="margin_end">10</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="halign">end</property>
@@ -224,8 +224,8 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
- <property name="margin_left">10</property>
- <property name="margin_right">10</property>
+ <property name="margin_start">10</property>
+ <property name="margin_end">10</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="hexpand">True</property>
@@ -245,8 +245,8 @@
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="margin_left">20</property>
- <property name="margin_right">20</property>
+ <property name="margin_start">20</property>
+ <property name="margin_end">20</property>
<property name="margin_top">20</property>
<property name="margin_bottom">20</property>
<property name="hexpand">True</property>
@@ -266,8 +266,8 @@
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">end</property>
- <property name="margin_left">10</property>
- <property name="margin_right">10</property>
+ <property name="margin_start">10</property>
+ <property name="margin_end">10</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="hexpand">True</property>
diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
index dde8748..f2bbe6b 100644
--- a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
+++ b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
@@ -44,7 +44,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Type the name by which you would like to refer to this
account.
For example, "Work" or "Personal".</property>
@@ -60,7 +60,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Name:</property>
<property name="use_underline">True</property>
@@ -106,7 +106,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Full Nam_e:</property>
<property name="use_underline">True</property>
@@ -137,7 +137,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="label" translatable="yes">Email _Address:</property>
<property name="use_underline">True</property>
</object>
@@ -181,7 +181,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Re_ply-To:</property>
<property name="use_underline">True</property>
@@ -212,7 +212,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Or_ganization:</property>
<property name="use_underline">True</property>
diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ui
b/testsuite/reftests/sizegroups-evolution-identity-page.ui
index f213d57..42724d3 100644
--- a/testsuite/reftests/sizegroups-evolution-identity-page.ui
+++ b/testsuite/reftests/sizegroups-evolution-identity-page.ui
@@ -49,7 +49,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Type the name by which you would like to refer to
this account.
For example, "Work" or "Personal".</property>
@@ -65,7 +65,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Name:</property>
<property name="use_underline">True</property>
@@ -124,7 +124,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Full Nam_e:</property>
<property name="use_underline">True</property>
@@ -155,7 +155,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="label" translatable="yes">Email _Address:</property>
<property name="use_underline">True</property>
</object>
@@ -212,7 +212,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Re_ply-To:</property>
<property name="use_underline">True</property>
@@ -243,7 +243,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_start">12</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Or_ganization:</property>
<property name="use_underline">True</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
