AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'wip/chergert/undo-fixes' into 'master'

Browse Source 
texthistory: add barriers after final grouping

Closes #4276

See merge request GNOME/gtk!3989
This commit is contained in:
Matthias Clasen 2021-09-24 12:36:30 +00:00
commit e41bf097d0
3 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtktexthistory.c
View File

@ -224,6 +224,12 @@ action_chain (Action *action,
if (other->kind == ACTION_KIND_BARRIER)
{
/* If we're not in a user action, this barrier is meant to
* stop items from coallescing into this group.
*/
if (!in_user_action && action->u.group.depth == 0)
return FALSE;
action_free (other);
return TRUE;
}

25
gtk/gtktextview.c
View File

@ -8439,17 +8439,32 @@ gtk_text_view_commit_text (GtkTextView *text_view,
{
GtkTextViewPrivate *priv;
gboolean had_selection;
GtkTextIter begin, end;
guint length;
priv = text_view->priv;
gtk_text_view_obscure_mouse_cursor (text_view);
gtk_text_buffer_begin_user_action (get_buffer (text_view));
had_selection = gtk_text_buffer_get_selection_bounds (get_buffer (text_view),
NULL, NULL);
gtk_text_buffer_delete_selection (get_buffer (text_view), TRUE,
priv->editable);
had_selection = gtk_text_buffer_get_selection_bounds (get_buffer (text_view), &begin, &end);
gtk_text_iter_order (&begin, &end);
length = gtk_text_iter_get_offset (&end) - gtk_text_iter_get_offset (&begin);
if (gtk_text_buffer_delete_selection (get_buffer (text_view), TRUE, priv->editable))
{
/* If something was deleted, create a second group for the insert. This
* ensures that there are two undo operations. One for the deletion, and
* one for the insertion of new text. However, if there is only a single
* character overwritten, that isn't very useful, just keep the single
* undo group.
*/
if (length > 1)
{
gtk_text_buffer_end_user_action (get_buffer (text_view));
gtk_text_buffer_begin_user_action (get_buffer (text_view));
}
}
if (!strcmp (str, "\n"))
{

18
testsuite/gtk/texthistory.c
View File

@ -606,6 +606,23 @@ test14 (void)
g_free (fill_after_2);
}
static void
test_issue_4276 (void)
{
const Command commands[] = {
{ INSERT, 0, -1, "this is some text", "this is some text", SET, UNSET, UNSET },
{ SELECT, 0, 17, NULL, "this is some text", SET, UNSET, UNSET },
{ BEGIN_USER, -1, -1, NULL, NULL, UNSET, UNSET, UNSET },
{ DELETE_KEY, 0, 17, "this is some text", "", UNSET, UNSET, UNSET },
{ INSERT, 0, -1, "z", "z", UNSET, UNSET, UNSET },
{ END_USER, -1, -1, NULL, NULL, SET, UNSET, UNSET },
{ INSERT, 1, -1, "zzz", "zzzz", SET, UNSET, UNSET },
{ UNDO, -1, -1, NULL, "z", SET, SET, UNSET },
};
run_test (commands, G_N_ELEMENTS (commands), 0);
}
int
main (int argc,
char *argv[])
@ -626,6 +643,7 @@ main (int argc,
g_test_add_func ("/Gtk/TextHistory/test12", test12);
g_test_add_func ("/Gtk/TextHistory/test13", test13);
g_test_add_func ("/Gtk/TextHistory/test14", test14);
g_test_add_func ("/Gtk/TextHistory/issue_4276", test_issue_4276);
return g_test_run ();
}