[gtk+] stylecontext: Revert part of previous commit
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] stylecontext: Revert part of previous commit
- Date: Fri, 15 Nov 2013 03:34:15 +0000 (UTC)
commit 06a64ccfcff37cfe2554a5ac239d9a6ad380c321
Author: Benjamin Otte <otte redhat com>
Date: Fri Nov 15 04:16:33 2013 +0100
stylecontext: Revert part of previous commit
Commit 719dd636a9da679ea08a9644a8cccfe7d6f145d7 replaces
margin-left/right with margin-start/end. CSS does not have
margin-start/margin-end properties, the sed script was a bit overeager.
Fwiw, CSS implements RTL margin styling via :dir(rtl) selectors.
gtk/gtkstylecontext.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index d883c9f..9f35f42 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -3634,26 +3634,23 @@ gtk_style_context_get_margin (GtkStyleContext *context,
GtkStateFlags state,
GtkBorder *margin)
{
- int top, start, bottom, end;
- gboolean rtl;
+ int top, left, bottom, right;
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-start", &start,
+ "margin-left", &left,
"margin-bottom", &bottom,
- "margin-end", &end,
+ "margin-right", &right,
NULL);
margin->top = top;
- margin->left = rtl ? start : end;
+ margin->left = left;
margin->bottom = bottom;
- margin->right = rtl ? end : start;
+ margin->right = right;
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]