fix an incorrect assertion that the "valid" flag is always correct in a

2001-12-31  Havoc Pennington  <hp@pobox.com>

	* gtk/gtktextbtree.c (gtk_text_btree_node_view_check_consistency):
	fix an incorrect assertion that the "valid" flag is always correct
	in a node and add explanatory comment. This keeps me from
	reproducing #59101, but I'm remembering that 59101 was actually
	about incorrect pixel totals, so I'm not sure 59101 is actually
	fixed. May just have stopped happening due to some change in
	how C-k works.
This commit is contained in:
Havoc Pennington 2001-12-31 22:17:26 +00:00 committed by Havoc Pennington
parent 64891890fb
commit 9b185ed750
8 changed files with 82 additions and 1 deletions

View File

@ -1,3 +1,13 @@
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.c (gtk_text_btree_node_view_check_consistency):
fix an incorrect assertion that the "valid" flag is always correct
in a node and add explanatory comment. This keeps me from
reproducing #59101, but I'm remembering that 59101 was actually
about incorrect pixel totals, so I'm not sure 59101 is actually
fixed. May just have stopped happening due to some change in
how C-k works.
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_start_selection_drag): extend

View File

@ -1,3 +1,13 @@
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.c (gtk_text_btree_node_view_check_consistency):
fix an incorrect assertion that the "valid" flag is always correct
in a node and add explanatory comment. This keeps me from
reproducing #59101, but I'm remembering that 59101 was actually
about incorrect pixel totals, so I'm not sure 59101 is actually
fixed. May just have stopped happening due to some change in
how C-k works.
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_start_selection_drag): extend

View File

@ -1,3 +1,13 @@
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.c (gtk_text_btree_node_view_check_consistency):
fix an incorrect assertion that the "valid" flag is always correct
in a node and add explanatory comment. This keeps me from
reproducing #59101, but I'm remembering that 59101 was actually
about incorrect pixel totals, so I'm not sure 59101 is actually
fixed. May just have stopped happening due to some change in
how C-k works.
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_start_selection_drag): extend

View File

@ -1,3 +1,13 @@
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.c (gtk_text_btree_node_view_check_consistency):
fix an incorrect assertion that the "valid" flag is always correct
in a node and add explanatory comment. This keeps me from
reproducing #59101, but I'm remembering that 59101 was actually
about incorrect pixel totals, so I'm not sure 59101 is actually
fixed. May just have stopped happening due to some change in
how C-k works.
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_start_selection_drag): extend

View File

@ -1,3 +1,13 @@
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.c (gtk_text_btree_node_view_check_consistency):
fix an incorrect assertion that the "valid" flag is always correct
in a node and add explanatory comment. This keeps me from
reproducing #59101, but I'm remembering that 59101 was actually
about incorrect pixel totals, so I'm not sure 59101 is actually
fixed. May just have stopped happening due to some change in
how C-k works.
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_start_selection_drag): extend

View File

@ -1,3 +1,13 @@
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.c (gtk_text_btree_node_view_check_consistency):
fix an incorrect assertion that the "valid" flag is always correct
in a node and add explanatory comment. This keeps me from
reproducing #59101, but I'm remembering that 59101 was actually
about incorrect pixel totals, so I'm not sure 59101 is actually
fixed. May just have stopped happening due to some change in
how C-k works.
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_start_selection_drag): extend

View File

@ -1,3 +1,13 @@
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.c (gtk_text_btree_node_view_check_consistency):
fix an incorrect assertion that the "valid" flag is always correct
in a node and add explanatory comment. This keeps me from
reproducing #59101, but I'm remembering that 59101 was actually
about incorrect pixel totals, so I'm not sure 59101 is actually
fixed. May just have stopped happening due to some change in
how C-k works.
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_start_selection_drag): extend

View File

@ -6431,9 +6431,20 @@ gtk_text_btree_node_view_check_consistency (GtkTextBTree *tree,
gtk_text_btree_node_compute_view_aggregates (node, nd->view_id,
&width, &height, &valid);
/* valid aggregate not checked the same as width/height, because on
* btree rebalance we can have invalid nodes where all lines below
* them are actually valid, due to moving lines around between
* nodes.
*
* The guarantee is that if there are invalid lines the node is
* invalid - we don't guarantee that if the node is invalid there
* are invalid lines.
*/
if (nd->width != width ||
nd->height != height ||
!nd->valid != !valid)
(nd->valid && !valid))
{
g_error ("Node aggregates for view %p are invalid:\n"
"Are (%d,%d,%s), should be (%d,%d,%s)",