From 422863a0ad64b9fedf8f6ccb664e35718f5d1dea Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Fri, 01 Jun 2012 22:29:11 +0000 Subject: Undo after using bucket tool fixed SL #3105 Fixed the ability to go back and forward through the undo list after using many times the bucket tool. Signed-off-by: Manuel Kaufmann Acked-by: Manuel QuiƱones --- (limited to 'Area.py') diff --git a/Area.py b/Area.py index d8997a1..a81cda3 100644 --- a/Area.py +++ b/Area.py @@ -663,13 +663,18 @@ class Area(gtk.DrawingArea): widget.queue_draw() self.drawing = False self.desenha = False - if not private_undo: + if not private_undo and self.tool['name'] != 'bucket': + # We have to avoid saving an undo state if the bucket tool + # is selected because this undo state is called before the + # gobject.idle_add (with the fill_flood function) finishes + # and an unconsistent undo state is saved self.enableUndo(widget) def fast_flood_fill(self, widget, x, y, width, height): fill(self.pixmap, self.gc, x, y, width, height, self.gc_line.foreground.pixel) widget.queue_draw() + self.enableUndo(widget) display = gtk.gdk.display_get_default() cursor = gtk.gdk.cursor_new_from_name(display, 'paint-bucket') self.window.set_cursor(cursor) @@ -709,6 +714,7 @@ class Area(gtk.DrawingArea): self.pixmap.draw_image(self.gc, gdk_image, 0, 0, 0, 0, width, height) self.queue_draw() + self.enableUndo(self) display = gtk.gdk.display_get_default() cursor = gtk.gdk.cursor_new_from_name(display, 'paint-bucket') -- cgit v0.9.1