From 2d6557175fe0014566fa80ed31c30a8dff896cde Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 4 Feb 2005 15:37:48 +0000 Subject: [PATCH] Avoid spurious selection of RTL direction if the widget does not have 2005-02-04 Matthias Clasen * gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious selection of RTL direction if the widget does not have focus. (#164125, Frederic Crozat) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkentry.c | 5 ++++- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6121f6e1e0..7aab1a2605 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-02-04 Matthias Clasen + + * gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious + selection of RTL direction if the widget does not have + focus. (#164125, Frederic Crozat) + Thu Feb 3 19:15:55 2005 Manish Singh * gdk/x11/gdkdrawable-x11.c: #include cairo-xlib.h diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6121f6e1e0..7aab1a2605 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-02-04 Matthias Clasen + + * gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious + selection of RTL direction if the widget does not have + focus. (#164125, Frederic Crozat) + Thu Feb 3 19:15:55 2005 Manish Singh * gdk/x11/gdkdrawable-x11.c: #include cairo-xlib.h diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6121f6e1e0..7aab1a2605 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-02-04 Matthias Clasen + + * gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious + selection of RTL direction if the widget does not have + focus. (#164125, Frederic Crozat) + Thu Feb 3 19:15:55 2005 Manish Singh * gdk/x11/gdkdrawable-x11.c: #include cairo-xlib.h diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 7a81353c82..fbe019f6b1 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -2968,7 +2968,10 @@ gtk_entry_create_layout (GtkEntry *entry, { GdkDisplay *display = gtk_widget_get_display (widget); GdkKeymap *keymap = gdk_keymap_get_for_display (display); - pango_dir = gdk_keymap_get_direction (keymap); + if (gdk_keymap_get_direction (keymap) == PANGO_DIRECTION_RTL) + pango_dir = PANGO_DIRECTION_RTL; + else + pango_dir = PANGO_DIRECTION_LTR; } else {