Merge branch 'master' of git.sugarlabs.org:paint/mainline

2 files changed, 8 insertions, 2 deletions

diff --git a/Area.py b/Area.py
index b889974..d8997a1 100644
--- a/Area.py
+++ b/Area.py
@@ -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):
diff --git a/toolbox.py b/toolbox.py
index f781b4a..dcdfeb0 100644
--- a/toolbox.py
+++ b/toolbox.py
@@ -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):