From 6a227eec1cd13cd5b364b2f1f3c77febc5d70de5 Mon Sep 17 00:00:00 2001 From: Lars Hamann Date: Wed, 4 Nov 1998 21:44:09 +0000 Subject: [PATCH] fix focus_row adjustment (gtk_ctree_remove_node): select focus_row if Wed Nov 4 21:52:57 1998 Lars Hamann * gtk/gtkctree.c (gtk_ctree_unlink): fix focus_row adjustment (gtk_ctree_remove_node): select focus_row if needed (cell_size_request): only get pixmap size if pixmap != NULL --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkctree.c | 28 +++++++++++++++++++++++----- 8 files changed, 65 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05d7bccd0..b873509e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Nov 4 21:52:57 1998 Lars Hamann + + * gtk/gtkctree.c (gtk_ctree_unlink): fix focus_row adjustment + (gtk_ctree_remove_node): select focus_row if needed + (cell_size_request): only get pixmap size if pixmap != NULL + Wed Nov 4 04:30:37 1998 Tim Janik * gtk/gtkwidget.c: added a bunch of checks for widget != NULL and diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 05d7bccd0..b873509e8 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Wed Nov 4 21:52:57 1998 Lars Hamann + + * gtk/gtkctree.c (gtk_ctree_unlink): fix focus_row adjustment + (gtk_ctree_remove_node): select focus_row if needed + (cell_size_request): only get pixmap size if pixmap != NULL + Wed Nov 4 04:30:37 1998 Tim Janik * gtk/gtkwidget.c: added a bunch of checks for widget != NULL and diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 05d7bccd0..b873509e8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Nov 4 21:52:57 1998 Lars Hamann + + * gtk/gtkctree.c (gtk_ctree_unlink): fix focus_row adjustment + (gtk_ctree_remove_node): select focus_row if needed + (cell_size_request): only get pixmap size if pixmap != NULL + Wed Nov 4 04:30:37 1998 Tim Janik * gtk/gtkwidget.c: added a bunch of checks for widget != NULL and diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 05d7bccd0..b873509e8 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Nov 4 21:52:57 1998 Lars Hamann + + * gtk/gtkctree.c (gtk_ctree_unlink): fix focus_row adjustment + (gtk_ctree_remove_node): select focus_row if needed + (cell_size_request): only get pixmap size if pixmap != NULL + Wed Nov 4 04:30:37 1998 Tim Janik * gtk/gtkwidget.c: added a bunch of checks for widget != NULL and diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 05d7bccd0..b873509e8 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Nov 4 21:52:57 1998 Lars Hamann + + * gtk/gtkctree.c (gtk_ctree_unlink): fix focus_row adjustment + (gtk_ctree_remove_node): select focus_row if needed + (cell_size_request): only get pixmap size if pixmap != NULL + Wed Nov 4 04:30:37 1998 Tim Janik * gtk/gtkwidget.c: added a bunch of checks for widget != NULL and diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 05d7bccd0..b873509e8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Nov 4 21:52:57 1998 Lars Hamann + + * gtk/gtkctree.c (gtk_ctree_unlink): fix focus_row adjustment + (gtk_ctree_remove_node): select focus_row if needed + (cell_size_request): only get pixmap size if pixmap != NULL + Wed Nov 4 04:30:37 1998 Tim Janik * gtk/gtkwidget.c: added a bunch of checks for widget != NULL and diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 05d7bccd0..b873509e8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Nov 4 21:52:57 1998 Lars Hamann + + * gtk/gtkctree.c (gtk_ctree_unlink): fix focus_row adjustment + (gtk_ctree_remove_node): select focus_row if needed + (cell_size_request): only get pixmap size if pixmap != NULL + Wed Nov 4 04:30:37 1998 Tim Janik * gtk/gtkwidget.c: added a bunch of checks for widget != NULL and diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index 2f5d3e619..16f7c3925 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -2421,10 +2421,17 @@ gtk_ctree_unlink (GtkCTree *ctree, gint pos; pos = g_list_position (clist->row_list, (GList *)node); - if (pos + rows + 1 < clist->focus_row) + if (pos + rows < clist->focus_row) clist->focus_row -= (rows + 1); else if (pos <= clist->focus_row) - clist->focus_row = pos - 1; + { + if (!GTK_CTREE_ROW (node)->sibling) + clist->focus_row = MAX (pos - 1, 0); + else + clist->focus_row = pos; + + clist->focus_row = MIN (clist->focus_row, clist->rows - 1); + } clist->undo_anchor = clist->focus_row; } } @@ -2971,10 +2978,17 @@ cell_size_request (GtkCList *clist, requisition->height = style->font->ascent + style->font->descent; break; case GTK_CELL_PIXTEXT: - gdk_window_get_size (GTK_CELL_PIXTEXT (clist_row->cell[column])->pixmap, - &width, &height); + if (GTK_CELL_PIXTEXT (clist_row->cell[column])->pixmap) + { + gdk_window_get_size (GTK_CELL_PIXTEXT + (clist_row->cell[column])->pixmap, + &width, &height); + width += GTK_CELL_PIXTEXT (clist_row->cell[column])->spacing; + } + else + width = height = 0; + requisition->width = width + - GTK_CELL_PIXTEXT (clist_row->cell[column])->spacing + gdk_string_width (style->font, GTK_CELL_TEXT (clist_row->cell[column])->text); @@ -4042,6 +4056,10 @@ gtk_ctree_remove_node (GtkCTree *ctree, gtk_ctree_unlink (ctree, node, TRUE); gtk_ctree_post_recursive (ctree, node, GTK_CTREE_FUNC (tree_delete), NULL); + if ((clist->selection_mode == GTK_SELECTION_BROWSE || + clist->selection_mode == GTK_SELECTION_EXTENDED) && + !clist->selection && clist->focus_row >= 0) + gtk_clist_select_row (clist, clist->focus_row, -1); if (!GTK_CLIST_AUTO_RESIZE_BLOCKED (clist)) {