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

Make sure we don't call back into GtkEntryBuffer

Browse Source 
After commit 7e77afe94c moved the deletion
of text into the signal handler, in order to make undo work, we need to
override the GtkEntryBuffer::deleted-text class closure when subclassing
GtkEntryBuffer, as well as overriding GtkEntryBufferClass.delete_text,
otherwise the default class closure will be invoked, and will try to
delete an empty buffer.

Fixes: #3140
This commit is contained in:
Emmanuele Bassi 2020-09-09 11:29:16 +01:00
parent b3d3d81c82
commit f4b410daa7
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/gtkpasswordentrybuffer.c
View File

@ -122,6 +122,21 @@ gtk_password_entry_buffer_real_insert_text (GtkEntryBuffer *buffer,
return n_chars; return n_chars;
} }
static void
gtk_password_entry_buffer_real_deleted_text (GtkEntryBuffer *buffer,
guint position,
guint n_chars)
{
GtkPasswordEntryBuffer *self = GTK_PASSWORD_ENTRY_BUFFER (buffer);
gsize start = g_utf8_offset_to_pointer (self->text, position) - self->text;
gsize end = g_utf8_offset_to_pointer (self->text, position + n_chars) - self->text;
memmove (self->text + start, self->text + end, self->text_bytes + 1 - end);
self->text_chars -= n_chars;
self->text_bytes -= (end - start);
}
static guint static guint
gtk_password_entry_buffer_real_delete_text (GtkEntryBuffer *buffer, gtk_password_entry_buffer_real_delete_text (GtkEntryBuffer *buffer,
guint position, guint position,
@ -135,16 +150,7 @@ gtk_password_entry_buffer_real_delete_text (GtkEntryBuffer *buffer,
n_chars = self->text_chars - position; n_chars = self->text_chars - position;
if (n_chars > 0) if (n_chars > 0)
{
gsize start = g_utf8_offset_to_pointer (self->text, position) - self->text;
gsize end = g_utf8_offset_to_pointer (self->text, position + n_chars) - self->text;
memmove (self->text + start, self->text + end, self->text_bytes + 1 - end);
self->text_chars -= n_chars;
self->text_bytes -= (end - start);
gtk_entry_buffer_emit_deleted_text (buffer, position, n_chars); gtk_entry_buffer_emit_deleted_text (buffer, position, n_chars);
}
return n_chars; return n_chars;
} }
@ -175,6 +181,7 @@ gtk_password_entry_buffer_class_init (GtkPasswordEntryBufferClass *klass)
buffer_class->get_length = gtk_password_entry_buffer_real_get_length; buffer_class->get_length = gtk_password_entry_buffer_real_get_length;
buffer_class->insert_text = gtk_password_entry_buffer_real_insert_text; buffer_class->insert_text = gtk_password_entry_buffer_real_insert_text;
buffer_class->delete_text = gtk_password_entry_buffer_real_delete_text; buffer_class->delete_text = gtk_password_entry_buffer_real_delete_text;
buffer_class->deleted_text = gtk_password_entry_buffer_real_deleted_text;
} }
static void static void