diff options
author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-05-30 04:34:03 (GMT) |
---|---|---|
committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-05-30 04:34:03 (GMT) |
commit | 772f2bdc641169b776376adbbca30d34a20d51ef (patch) | |
tree | 3305ed9eb0130b145215f48b59e95d4faf99583a | |
parent | 37b11243faf0eef31d44487181d5505d65432513 (diff) | |
parent | d20721442caa22d89f83b6c43d35d3aafae3f4bc (diff) |
Merge branch 'master' of git.sugarlabs.org:paint/mainline
-rw-r--r-- | Area.py | 3 | ||||
-rw-r--r-- | toolbox.py | 7 |
2 files changed, 8 insertions, 2 deletions
@@ -786,6 +786,9 @@ class Area(gtk.DrawingArea): self.resized_stamp = self.pixbuf_stamp.scale_simple(wr, hr, gtk.gdk.INTERP_HYPER) + # Remove selected area + self.getout() + return self.resized_stamp def undo(self): @@ -349,8 +349,11 @@ class ToolsToolbarBuilder(): self._verify_sensitive_buttons() def _verify_sensitive_buttons(self): - is_selected = self._activity.area.is_selected() - self._tool_stamp.set_sensitive(is_selected) + # Check if there is an area selected or if the "stamp" tool is + # being used + sensitive = self._activity.area.is_selected() or \ + self.tool['name'] == 'stamp' + self._tool_stamp.set_sensitive(sensitive) class ButtonFillColor(ColorToolButton): |