diff --git a/ChangeLog b/ChangeLog index bbb15e65fb..0a83d439d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2002-04-30 Havoc Pennington + + * gtk/gtktextlayout.c (gtk_text_layout_real_free_line_data): use + gtk_text_layout_invalidate_cache instead of cut-and-paste + (gtk_text_layout_real_invalidate): always invalidate cache, even + if the line has no stored line data. #78573 + + * gtk/gtktextview.c (gtk_text_view_get_iter_location): add call to + gtk_text_view_ensure_layout, #77388 + (gtk_text_view_get_iter_at_location): ditto + (gtk_text_view_get_line_yrange): ditto + (gtk_text_view_get_line_at_y): ditto + 2002-04-30 Havoc Pennington * gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): assign diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bbb15e65fb..0a83d439d8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,16 @@ +2002-04-30 Havoc Pennington + + * gtk/gtktextlayout.c (gtk_text_layout_real_free_line_data): use + gtk_text_layout_invalidate_cache instead of cut-and-paste + (gtk_text_layout_real_invalidate): always invalidate cache, even + if the line has no stored line data. #78573 + + * gtk/gtktextview.c (gtk_text_view_get_iter_location): add call to + gtk_text_view_ensure_layout, #77388 + (gtk_text_view_get_iter_at_location): ditto + (gtk_text_view_get_line_yrange): ditto + (gtk_text_view_get_line_at_y): ditto + 2002-04-30 Havoc Pennington * gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): assign diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bbb15e65fb..0a83d439d8 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,16 @@ +2002-04-30 Havoc Pennington + + * gtk/gtktextlayout.c (gtk_text_layout_real_free_line_data): use + gtk_text_layout_invalidate_cache instead of cut-and-paste + (gtk_text_layout_real_invalidate): always invalidate cache, even + if the line has no stored line data. #78573 + + * gtk/gtktextview.c (gtk_text_view_get_iter_location): add call to + gtk_text_view_ensure_layout, #77388 + (gtk_text_view_get_iter_at_location): ditto + (gtk_text_view_get_line_yrange): ditto + (gtk_text_view_get_line_at_y): ditto + 2002-04-30 Havoc Pennington * gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): assign diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bbb15e65fb..0a83d439d8 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,16 @@ +2002-04-30 Havoc Pennington + + * gtk/gtktextlayout.c (gtk_text_layout_real_free_line_data): use + gtk_text_layout_invalidate_cache instead of cut-and-paste + (gtk_text_layout_real_invalidate): always invalidate cache, even + if the line has no stored line data. #78573 + + * gtk/gtktextview.c (gtk_text_view_get_iter_location): add call to + gtk_text_view_ensure_layout, #77388 + (gtk_text_view_get_iter_at_location): ditto + (gtk_text_view_get_line_yrange): ditto + (gtk_text_view_get_line_at_y): ditto + 2002-04-30 Havoc Pennington * gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): assign diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bbb15e65fb..0a83d439d8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,16 @@ +2002-04-30 Havoc Pennington + + * gtk/gtktextlayout.c (gtk_text_layout_real_free_line_data): use + gtk_text_layout_invalidate_cache instead of cut-and-paste + (gtk_text_layout_real_invalidate): always invalidate cache, even + if the line has no stored line data. #78573 + + * gtk/gtktextview.c (gtk_text_view_get_iter_location): add call to + gtk_text_view_ensure_layout, #77388 + (gtk_text_view_get_iter_at_location): ditto + (gtk_text_view_get_line_yrange): ditto + (gtk_text_view_get_line_at_y): ditto + 2002-04-30 Havoc Pennington * gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): assign diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bbb15e65fb..0a83d439d8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,16 @@ +2002-04-30 Havoc Pennington + + * gtk/gtktextlayout.c (gtk_text_layout_real_free_line_data): use + gtk_text_layout_invalidate_cache instead of cut-and-paste + (gtk_text_layout_real_invalidate): always invalidate cache, even + if the line has no stored line data. #78573 + + * gtk/gtktextview.c (gtk_text_view_get_iter_location): add call to + gtk_text_view_ensure_layout, #77388 + (gtk_text_view_get_iter_at_location): ditto + (gtk_text_view_get_line_yrange): ditto + (gtk_text_view_get_line_at_y): ditto + 2002-04-30 Havoc Pennington * gtk/gtktextbtree.c (gtk_text_btree_remove_tag_info): assign diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 71b585ac87..e414bf975d 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -719,11 +719,10 @@ gtk_text_layout_real_invalidate (GtkTextLayout *layout, { GtkTextLineData *line_data = _gtk_text_line_get_data (line, layout); + gtk_text_layout_invalidate_cache (layout, line); + if (line_data) - { - gtk_text_layout_invalidate_cache (layout, line); - _gtk_text_line_invalidate_wrap (line, line_data); - } + _gtk_text_line_invalidate_wrap (line, line_data); if (line == last_line) break; @@ -739,12 +738,7 @@ gtk_text_layout_real_free_line_data (GtkTextLayout *layout, GtkTextLine *line, GtkTextLineData *line_data) { - if (layout->one_display_cache && line == layout->one_display_cache->line) - { - GtkTextLineDisplay *tmp_display = layout->one_display_cache; - layout->one_display_cache = NULL; - gtk_text_layout_free_line_display (layout, tmp_display); - } + gtk_text_layout_invalidate_cache (layout, line); g_free (line_data); } diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index f461077392..1e30222d2a 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -1190,8 +1190,9 @@ gtk_text_view_get_iter_at_location (GtkTextView *text_view, { g_return_if_fail (GTK_IS_TEXT_VIEW (text_view)); g_return_if_fail (iter != NULL); - g_return_if_fail (text_view->layout != NULL); + gtk_text_view_ensure_layout (text_view); + gtk_text_layout_get_iter_at_pixel (text_view->layout, iter, x, @@ -1218,6 +1219,8 @@ gtk_text_view_get_iter_location (GtkTextView *text_view, g_return_if_fail (GTK_IS_TEXT_VIEW (text_view)); g_return_if_fail (gtk_text_iter_get_buffer (iter) == get_buffer (text_view)); + gtk_text_view_ensure_layout (text_view); + gtk_text_layout_get_iter_location (text_view->layout, iter, location); } @@ -1242,6 +1245,8 @@ gtk_text_view_get_line_yrange (GtkTextView *text_view, g_return_if_fail (GTK_IS_TEXT_VIEW (text_view)); g_return_if_fail (gtk_text_iter_get_buffer (iter) == get_buffer (text_view)); + gtk_text_view_ensure_layout (text_view); + gtk_text_layout_get_line_yrange (text_view->layout, iter, y, @@ -1269,6 +1274,8 @@ gtk_text_view_get_line_at_y (GtkTextView *text_view, { g_return_if_fail (GTK_IS_TEXT_VIEW (text_view)); + gtk_text_view_ensure_layout (text_view); + gtk_text_layout_get_line_at_y (text_view->layout, target_iter, y,