diff --git a/ChangeLog b/ChangeLog index 3be7828054..52ce513608 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu Dec 18 01:21:59 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_class_init): Jonathan got + the logical flag backwards in the expand_collapse_cursor_row + bindings, fixing. + (gtk_tree_view_real_expand_collapse_cursor_row): invert expand + flag when !logical and in RTL. (Fixes #107527, reported by + Noah Levitt). + Thu Dec 18 01:10:16 2003 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_button_press): only start diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3be7828054..52ce513608 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Thu Dec 18 01:21:59 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_class_init): Jonathan got + the logical flag backwards in the expand_collapse_cursor_row + bindings, fixing. + (gtk_tree_view_real_expand_collapse_cursor_row): invert expand + flag when !logical and in RTL. (Fixes #107527, reported by + Noah Levitt). + Thu Dec 18 01:10:16 2003 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_button_press): only start diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3be7828054..52ce513608 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Thu Dec 18 01:21:59 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_class_init): Jonathan got + the logical flag backwards in the expand_collapse_cursor_row + bindings, fixing. + (gtk_tree_view_real_expand_collapse_cursor_row): invert expand + flag when !logical and in RTL. (Fixes #107527, reported by + Noah Levitt). + Thu Dec 18 01:10:16 2003 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_button_press): only start diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3be7828054..52ce513608 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Thu Dec 18 01:21:59 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_class_init): Jonathan got + the logical flag backwards in the expand_collapse_cursor_row + bindings, fixing. + (gtk_tree_view_real_expand_collapse_cursor_row): invert expand + flag when !logical and in RTL. (Fixes #107527, reported by + Noah Levitt). + Thu Dec 18 01:10:16 2003 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_button_press): only start diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3be7828054..52ce513608 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Thu Dec 18 01:21:59 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_class_init): Jonathan got + the logical flag backwards in the expand_collapse_cursor_row + bindings, fixing. + (gtk_tree_view_real_expand_collapse_cursor_row): invert expand + flag when !logical and in RTL. (Fixes #107527, reported by + Noah Levitt). + Thu Dec 18 01:10:16 2003 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_button_press): only start diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 0a714995e6..55041acd64 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -930,63 +930,63 @@ G_PARAM_READABLE)); /* expand and collapse rows */ gtk_binding_entry_add_signal (binding_set, GDK_plus, 0, "expand_collapse_cursor_row", 3, - G_TYPE_BOOLEAN, FALSE, + G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, FALSE); /* Not doable on US keyboards */ gtk_binding_entry_add_signal (binding_set, GDK_plus, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3, - G_TYPE_BOOLEAN, FALSE, + G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, TRUE); gtk_binding_entry_add_signal (binding_set, GDK_KP_Add, 0, "expand_collapse_cursor_row", 3, - G_TYPE_BOOLEAN, FALSE, + G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, FALSE); gtk_binding_entry_add_signal (binding_set, GDK_KP_Add, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3, - G_TYPE_BOOLEAN, FALSE, + G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, TRUE); gtk_binding_entry_add_signal (binding_set, GDK_KP_Add, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3, - G_TYPE_BOOLEAN, FALSE, + G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, TRUE); gtk_binding_entry_add_signal (binding_set, GDK_Right, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3, - G_TYPE_BOOLEAN, TRUE, + G_TYPE_BOOLEAN, FALSE, G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, TRUE); gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3, - G_TYPE_BOOLEAN, TRUE, + G_TYPE_BOOLEAN, FALSE, G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, TRUE); gtk_binding_entry_add_signal (binding_set, GDK_Right, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3, - G_TYPE_BOOLEAN, TRUE, + G_TYPE_BOOLEAN, FALSE, G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, TRUE); gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3, - G_TYPE_BOOLEAN, TRUE, + G_TYPE_BOOLEAN, FALSE, G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, TRUE); gtk_binding_entry_add_signal (binding_set, GDK_minus, 0, "expand_collapse_cursor_row", 3, - G_TYPE_BOOLEAN, FALSE, + G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, FALSE, G_TYPE_BOOLEAN, FALSE); gtk_binding_entry_add_signal (binding_set, GDK_minus, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3, - G_TYPE_BOOLEAN, FALSE, + G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, FALSE, G_TYPE_BOOLEAN, TRUE); gtk_binding_entry_add_signal (binding_set, GDK_KP_Subtract, 0, "expand_collapse_cursor_row", 3, - G_TYPE_BOOLEAN, FALSE, + G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, FALSE, G_TYPE_BOOLEAN, FALSE); gtk_binding_entry_add_signal (binding_set, GDK_KP_Subtract, GDK_SHIFT_MASK, "expand_collapse_cursor_row", 3, - G_TYPE_BOOLEAN, FALSE, + G_TYPE_BOOLEAN, TRUE, G_TYPE_BOOLEAN, FALSE, G_TYPE_BOOLEAN, TRUE); gtk_binding_entry_add_signal (binding_set, GDK_Left, GDK_SHIFT_MASK, @@ -8225,6 +8225,10 @@ gtk_tree_view_real_expand_collapse_cursor_row (GtkTreeView *tree_view, gtk_widget_grab_focus (GTK_WIDGET (tree_view)); gtk_tree_view_queue_draw_path (tree_view, cursor_path, NULL); + if (!logical + && gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL) + expand = !expand; + if (expand) gtk_tree_view_real_expand_row (tree_view, cursor_path, tree, node, open_all, TRUE); else