callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update IM spot location before running _validate_onscreen()

Browse Source 
Updating the IM spot location in gtk_text_view_value_changed() might
invalidate the layout, so we need to make sure that we update it before
validating the layout again.  Otherwise, the layout will be invalidated
right after validating it (possibly resulting in a failed
onscreen_validated assertion).  Patch merged from maemo-gtk.
This commit is contained in:
Kristian Rietveld 2009-09-04 13:30:48 +02:00
parent 4f219692ed
commit 3a917a2a67
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtktextview.c
View File

@ -7196,6 +7196,11 @@ gtk_text_view_value_changed (GtkAdjustment *adj,
*/
gtk_text_view_update_layout_width (text_view);
/* We also update the IM spot location here, since the IM context
* might do something that leads to validation.
*/
gtk_text_view_update_im_spot_location (text_view);
/* note that validation of onscreen could invoke this function
* recursively, by scrolling to maintain first_para, or in response
* to updating the layout width, however there is no problem with
@ -7230,6 +7235,9 @@ gtk_text_view_value_changed (GtkAdjustment *adj,
text_view->first_validate_idle = 0;
}
/* Finally we update the IM cursor location again, to ensure any
* changes made by the validation are pushed through.
*/
gtk_text_view_update_im_spot_location (text_view);
DV(g_print(">End scroll offset changed handler ("G_STRLOC")\n"));