From e73fba18b095f0c270f5d954e5993c155b488c73 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 27 Apr 2012 13:52:40 -0700
Subject: Creating shapes in a container

---
 js/tools/drawing-tool-base.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'js/tools/drawing-tool-base.js')

diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js
index 2283dfab..0b51aa28 100755
--- a/js/tools/drawing-tool-base.js
+++ b/js/tools/drawing-tool-base.js
@@ -41,11 +41,20 @@ exports.DrawingToolBase = Montage.create(Montage, {
 
 			// do the snap
 			var hitRec = snapManager.snap(x, y,  true);
+			var dragPlane;
 			if (hitRec) {
 				// set up the working plane and convert the hit record to be working plane relative
-				var dragPlane = snapManager.setupDragPlanes( hitRec );
-				var wpHitRec = hitRec.convertToWorkingPlane( dragPlane );
+				if (hitRec.getElement() === snapManager.application.ninja.currentSelectedContainer)
+				{
+					dragPlane = viewUtils.getUnprojectedElementPlane( hitRec.getElement() );
+					snapManager.setupDragPlaneFromPlane( dragPlane );
+				}
+				else
+				{
+					dragPlane = snapManager.setupDragPlanes( hitRec );
+				}
 
+				var wpHitRec = hitRec.convertToWorkingPlane( dragPlane );
 				var pt = hitRec.getScreenPoint();
 
                 return( [wpHitRec, pt[0], pt[1]] );
-- 
cgit v1.2.3