diff options
| author | Kristian Rietveld <kris@gtk.org> | 2003-12-18 00:25:11 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2003-12-18 00:25:11 +0000 |
| commit | 66def98927b07cb278e2a900009d289a0dc99d2b (patch) | |
| tree | 2837b04be7a203c7db17aa8e5888981b02690070 | |
| parent | 127e80d7b623c0811bf9f91cb6d7f97159fc19d9 (diff) | |
| download | gdk-pixbuf-66def98927b07cb278e2a900009d289a0dc99d2b.tar.gz | |
Jonathan got the logical flag backwards in the expand_collapse_cursor_row
Thu Dec 18 01:21:59 2003 Kristian Rietveld <kris@gtk.org>
* 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).
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 9 | ||||
| -rw-r--r-- | gtk/gtktreeview.c | 30 |
6 files changed, 62 insertions, 13 deletions
@@ -1,3 +1,12 @@ +Thu Dec 18 01:21:59 2003 Kristian Rietveld <kris@gtk.org> + + * 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 <kris@gtk.org> * gtk/gtktreeview.c (gtk_tree_view_button_press): only start diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3be782805..52ce51360 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Thu Dec 18 01:21:59 2003 Kristian Rietveld <kris@gtk.org> + + * 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 <kris@gtk.org> * gtk/gtktreeview.c (gtk_tree_view_button_press): only start diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3be782805..52ce51360 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Thu Dec 18 01:21:59 2003 Kristian Rietveld <kris@gtk.org> + + * 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 <kris@gtk.org> * gtk/gtktreeview.c (gtk_tree_view_button_press): only start diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3be782805..52ce51360 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Thu Dec 18 01:21:59 2003 Kristian Rietveld <kris@gtk.org> + + * 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 <kris@gtk.org> * gtk/gtktreeview.c (gtk_tree_view_button_press): only start diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3be782805..52ce51360 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Thu Dec 18 01:21:59 2003 Kristian Rietveld <kris@gtk.org> + + * 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 <kris@gtk.org> * gtk/gtktreeview.c (gtk_tree_view_button_press): only start diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 0a714995e..55041acd6 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 |