Use a shim in ImageEdit when CursorTool is active

cwillisf · cwillisf · commit 80e682ea955d · 2014-12-03T15:56:50.000-08:00
Instead of ImageEdit activating the selection tool while CursorTool is
active, it now activates a do-nothing shim tool that serves as a
placeholder specifically for CursorTool.
Also, switch to the selection too in ImageEdit when CursorTool is done.
diff --git a/src/svgeditor/ImageEdit.as b/src/svgeditor/ImageEdit.as
@@ -239,9 +239,7 @@ package svgeditor {
 		public function enableTools(enabled:Boolean):void {
 			uiLayer.mouseChildren = enabled;
 			uiLayer.alpha = enabled ? 1.0 : 0.6;
-			if (!enabled) {
-				setToolMode('select');
-			}
+			setToolMode(enabled ? 'select' : 'cursorTool');
 		}
 
 		public function isActive():Boolean {
@@ -607,6 +605,7 @@ package svgeditor {
 				case 'bitmapEraser': currentTool = new BitmapPencilTool(this, true); break;
 				case 'bitmapSelect': currentTool = new ObjectTransformer(this); break;
 				case 'paintbucket': currentTool = new PaintBucketTool(this); break;
+				case 'cursorTool': currentTool = new CursorToolShim(this); break;
 			}
 
 			if(currentTool is SVGEditTool) {
diff --git a/src/svgeditor/tools/CursorToolShim.as b/src/svgeditor/tools/CursorToolShim.as
@@ -0,0 +1,30 @@
+/*
+ * Scratch Project Editor and Player
+ * Copyright (C) 2014 Massachusetts Institute of Technology
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package svgeditor.tools {
+import svgeditor.ImageEdit;
+
+// This class is a valid but empty tool used as a placeholder while a legacy tool in CursorTool.as has control.
+public class CursorToolShim extends SVGEditTool {
+
+    public function CursorToolShim(ed:ImageEdit) {
+        super(ed);
+    }
+}
+}
