From 719dd636a9da679ea08a9644a8cccfe7d6f145d7 Mon Sep 17 00:00:00 2001 From: Yosef Or Boczko Date: Fri, 15 Nov 2013 00:31:17 +0200 Subject: [PATCH] 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 +++---- .../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 1d426014d3..b9423f2366 100644 --- a/demos/gtk-demo/listbox.ui +++ b/demos/gtk-demo/listbox.ui @@ -38,8 +38,8 @@ start 8 8 - 8 - 8 + 8 + 8 image-missing diff --git a/demos/gtk-demo/overlay.c b/demos/gtk-demo/overlay.c index b291ac1faf..60f419f67f 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 8512505839..b043d6bf4e 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. True 10 10 - 10 - 10 + 10 + 10 20 diff --git a/gtk/deprecated/gtktable.c b/gtk/deprecated/gtktable.c index 9191bc374b..774d0d18da 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 bfd3e1a7d5..3f4a9fc13f 100644 --- a/gtk/gtkcoloreditor.ui +++ b/gtk/gtkcoloreditor.ui @@ -38,8 +38,8 @@ True False - 30 - 30 + 30 + 30 12 12 @@ -157,8 +157,8 @@ True False - 12 - 12 + 12 + 12 12 12 6 @@ -215,8 +215,8 @@ True False - 12 - 12 + 12 + 12 12 12 6 @@ -273,8 +273,8 @@ True False - 12 - 12 + 12 + 12 12 12 6 diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c index 713bb7e0bc..6898f6f986 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 dd6a12e21f..c12bdab604 100644 --- a/gtk/gtkfontchooserwidget.ui +++ b/gtk/gtkfontchooserwidget.ui @@ -113,8 +113,8 @@ False center start - 12 - 12 + 12 + 12 12 12 No fonts matched your search. You can revise your search and try again. diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c index 59a8fa73b8..3fae8a187d 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 c4c6513e19..0a0530ab96 100644 --- a/gtk/gtkprintunixdialog.ui +++ b/gtk/gtkprintunixdialog.ui @@ -268,7 +268,7 @@ True False - 12 + 12 6 12 @@ -415,7 +415,7 @@ True False - 12 + 12 6 12 @@ -575,7 +575,7 @@ True False - 12 + 12 6 12 @@ -811,7 +811,7 @@ True False - 12 + 12 6 12 @@ -1080,7 +1080,7 @@ True False - 12 + 12 6 12 @@ -1189,7 +1189,7 @@ True False - 12 + 12 6 12 @@ -1328,7 +1328,7 @@ True False - 12 + 12 6 12 diff --git a/gtk/gtkstatusbar.ui b/gtk/gtkstatusbar.ui index 94c7f67fd9..c506b9b1ce 100644 --- a/gtk/gtkstatusbar.ui +++ b/gtk/gtkstatusbar.ui @@ -5,8 +5,8 @@ False False 2 - 10 - 10 + 10 + 10 6 6 diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c index 3363bb389b..1168a836f5 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 9f35f42c82..d883c9fe9a 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 7d8a6c5b82..71b99646c4 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 d3dccda72c..8b724410ad 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 ddc2ca0ab2..11fcf1726a 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 911050e986..161fd6c235 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 3eab9cd0f3..2de4c576b9 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 ec4d8ea044..3ac7df6159 100644 --- a/tests/visuals/osd-toolbars.ui +++ b/tests/visuals/osd-toolbars.ui @@ -104,8 +104,8 @@ True OSD Toolbar - 10 - 10 + 10 + 10 @@ -204,8 +204,8 @@ True Another kind of OSD toolbar - 10 - 10 + 10 + 10 diff --git a/testsuite/reftests/alignment-props.ui b/testsuite/reftests/alignment-props.ui index 40415a3661..08acf684b9 100644 --- a/testsuite/reftests/alignment-props.ui +++ b/testsuite/reftests/alignment-props.ui @@ -79,8 +79,8 @@ True 10 30 - 20 - 40 + 20 + 40 0 @@ -100,8 +100,8 @@ True 10 30 - 20 - 40 + 20 + 40 1 @@ -121,8 +121,8 @@ True 10 30 - 20 - 40 + 20 + 40 2 diff --git a/testsuite/reftests/inherit-and-initial.ref.ui b/testsuite/reftests/inherit-and-initial.ref.ui index 9c6a93b71d..d954396e78 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. inherit True False - 5 - 5 + 5 + 5 5 10 True diff --git a/testsuite/reftests/inherit-and-initial.ui b/testsuite/reftests/inherit-and-initial.ui index 7b9dc0ae49..be81c8f60a 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. True False - 5 - 5 + 5 + 5 5 10 True diff --git a/testsuite/reftests/misc-alignment.ui b/testsuite/reftests/misc-alignment.ui index a6e2b63f1e..622b8508b0 100644 --- a/testsuite/reftests/misc-alignment.ui +++ b/testsuite/reftests/misc-alignment.ui @@ -30,8 +30,8 @@ True False - 10 - 10 + 10 + 10 10 10 start @@ -51,8 +51,8 @@ True False - 20 - 20 + 20 + 20 20 20 center @@ -72,8 +72,8 @@ True False - 10 - 10 + 10 + 10 10 10 end @@ -126,8 +126,8 @@ True False - 10 - 10 + 10 + 10 10 10 start @@ -147,8 +147,8 @@ 16 True False - 20 - 20 + 20 + 20 20 20 center @@ -167,8 +167,8 @@ True False - 10 - 10 + 10 + 10 10 10 end @@ -224,8 +224,8 @@ False start start - 10 - 10 + 10 + 10 10 10 True @@ -245,8 +245,8 @@ False center center - 20 - 20 + 20 + 20 20 20 True @@ -266,8 +266,8 @@ False end end - 10 - 10 + 10 + 10 10 10 True diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui index dde8748cc5..f2bbe6b7b4 100644 --- a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui +++ b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui @@ -44,7 +44,7 @@ True False - 12 + 12 0 Type the name by which you would like to refer to this account. For example, "Work" or "Personal". @@ -60,7 +60,7 @@ For example, "Work" or "Personal". True False - 12 + 12 1 _Name: True @@ -106,7 +106,7 @@ For example, "Work" or "Personal". True False - 12 + 12 1 Full Nam_e: True @@ -137,7 +137,7 @@ For example, "Work" or "Personal". True False - 12 + 12 Email _Address: True @@ -181,7 +181,7 @@ For example, "Work" or "Personal". True False - 12 + 12 1 Re_ply-To: True @@ -212,7 +212,7 @@ For example, "Work" or "Personal". True False - 12 + 12 1 Or_ganization: True diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ui b/testsuite/reftests/sizegroups-evolution-identity-page.ui index f213d57e48..42724d3be5 100644 --- a/testsuite/reftests/sizegroups-evolution-identity-page.ui +++ b/testsuite/reftests/sizegroups-evolution-identity-page.ui @@ -49,7 +49,7 @@ True False - 12 + 12 0 Type the name by which you would like to refer to this account. For example, "Work" or "Personal". @@ -65,7 +65,7 @@ For example, "Work" or "Personal". True False - 12 + 12 1 _Name: True @@ -124,7 +124,7 @@ For example, "Work" or "Personal". True False - 12 + 12 1 Full Nam_e: True @@ -155,7 +155,7 @@ For example, "Work" or "Personal". True False - 12 + 12 Email _Address: True @@ -212,7 +212,7 @@ For example, "Work" or "Personal". True False - 12 + 12 1 Re_ply-To: True @@ -243,7 +243,7 @@ For example, "Work" or "Personal". True False - 12 + 12 1 Or_ganization: True