From 4150e5cbe17dc5bf3ee3445286707919872a7834 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 16 Jan 2005 03:53:41 +0000 Subject: [PATCH] Prefer LTR over RTL if the keymap is neutral. (#164125, Phil Blundell) 2005-01-15 Matthias Clasen * gtk/gtktextview.c (gtk_text_view_check_keymap_direction): * gtk/gtkentry.c (gtk_entry_create_layout): Prefer LTR over RTL if the keymap is neutral. (#164125, Phil Blundell) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkentry.c | 6 +++--- gtk/gtktextview.c | 6 +++--- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1107904b7..645fc6b792 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-01-15 Matthias Clasen + + * gtk/gtktextview.c (gtk_text_view_check_keymap_direction): + * gtk/gtkentry.c (gtk_entry_create_layout): Prefer LTR over RTL + if the keymap is neutral. (#164125, Phil Blundell) + 2005-01-13 Matthias Clasen * configure.in: Add an OS_LINUX conditional. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a1107904b7..645fc6b792 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-01-15 Matthias Clasen + + * gtk/gtktextview.c (gtk_text_view_check_keymap_direction): + * gtk/gtkentry.c (gtk_entry_create_layout): Prefer LTR over RTL + if the keymap is neutral. (#164125, Phil Blundell) + 2005-01-13 Matthias Clasen * configure.in: Add an OS_LINUX conditional. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a1107904b7..645fc6b792 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-01-15 Matthias Clasen + + * gtk/gtktextview.c (gtk_text_view_check_keymap_direction): + * gtk/gtkentry.c (gtk_entry_create_layout): Prefer LTR over RTL + if the keymap is neutral. (#164125, Phil Blundell) + 2005-01-13 Matthias Clasen * configure.in: Add an OS_LINUX conditional. diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 2560dba6b5..c5e0ee9548 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -2972,10 +2972,10 @@ gtk_entry_create_layout (GtkEntry *entry, } else { - if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) - pango_dir = PANGO_DIRECTION_LTR; - else + if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) pango_dir = PANGO_DIRECTION_RTL; + else + pango_dir = PANGO_DIRECTION_LTR; } } diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 04f8b26c58..9790c2b376 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -5751,10 +5751,10 @@ gtk_text_view_check_keymap_direction (GtkTextView *text_view) "gtk-split-cursor", &split_cursor, NULL); - if (gdk_keymap_get_direction (keymap) == PANGO_DIRECTION_LTR) - new_keyboard_dir = GTK_TEXT_DIR_LTR; + if (gdk_keymap_get_direction (keymap) == PANGO_DIRECTION_RTL) + new_keyboard_dir = GTK_TEXT_DIR_RTL; else - new_keyboard_dir = GTK_TEXT_DIR_RTL; + new_keyboard_dir = GTK_TEXT_DIR_LTR; if (split_cursor) new_cursor_dir = GTK_TEXT_DIR_NONE;