From dc347650e93cb98143da4d9fc013b7497059a35a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 9 Feb 2005 16:49:11 +0000 Subject: [PATCH] Fix RTL keynav for going from menubar to menu. 2005-02-09 Matthias Clasen * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): Fix RTL keynav for going from menubar to menu. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkmenushell.c | 6 ++++-- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b336233c06..4b6d11cb1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-02-09 Matthias Clasen + + * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): Fix RTL + keynav for going from menubar to menu. + 2005-02-08 Christian Rose * configure.in: Added "xh" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b336233c06..4b6d11cb1a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-02-09 Matthias Clasen + + * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): Fix RTL + keynav for going from menubar to menu. + 2005-02-08 Christian Rose * configure.in: Added "xh" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b336233c06..4b6d11cb1a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-02-09 Matthias Clasen + + * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): Fix RTL + keynav for going from menubar to menu. + 2005-02-08 Christian Rose * configure.in: Added "xh" to ALL_LINGUAS. diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 2618cc4839..1c910476c2 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -1097,10 +1097,12 @@ gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell, switch (direction) { case GTK_MENU_DIR_PARENT: - direction = GTK_MENU_DIR_CHILD; + if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement != GTK_TOP_BOTTOM) + direction = GTK_MENU_DIR_CHILD; break; case GTK_MENU_DIR_CHILD: - direction = GTK_MENU_DIR_PARENT; + if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement != GTK_TOP_BOTTOM) + direction = GTK_MENU_DIR_PARENT; break; case GTK_MENU_DIR_PREV: if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM)