Merge branch 'master' of github.com:okfocus/vvalls

1 files changed, 41 insertions, 12 deletions

diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index e424829..5af7f3f 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -6,7 +6,7 @@ Scenery.resize = new function(){
 	var obj
 	var x, y, z, bounds
 	var dragging = false
-	var naturalDimension, dimension, position, scale
+	var naturalDimension, naturalDimensionCopy, dimension, position, scale
 	var oldState
 
 	var dots = [], dot, selected_dot
@@ -143,6 +143,11 @@ Scenery.resize = new function(){
 		dimension = obj.dimensions
 		position = new vec3(obj.mx.x, obj.mx.y, obj.mx.z)
 		oldState = obj.serialize()
+		
+		if (obj.type == "text") {
+		  naturalDimensionCopy = naturalDimension.clone()
+		  positionCopy = position.clone()
+		}
 
 		document.body.classList.add("dragging")
 	}
@@ -163,15 +168,23 @@ Scenery.resize = new function(){
 			mag = y_sign * mag * sign(height)
 		}
 
- 		obj.set_scale( ( dimension.a + mag ) / naturalDimension.a )
+    if (obj.type == "text") {
+      obj.mx.width = obj.media.width = naturalDimension.a = naturalDimensionCopy.a + (mag * 2)
+      obj.mx.height = obj.media.height = naturalDimension.b = naturalDimensionCopy.b + (mag * 2)
+      dimension.a = naturalDimension.a * obj.scale
+      dimension.b = naturalDimension.b * obj.scale
+    }
+    else {
+      obj.set_scale( ( dimension.a + mag ) / naturalDimension.a )
+    }
 
-		if (selected_dot.side & LEFT_RIGHT) {
-			obj.mx.x = position.a + cos(rotationY) * mag/2 * (x_sign)
-			obj.mx.z = position.c + sin(rotationY) * mag/2 * (x_sign)
-		}
-		if (selected_dot.side & TOP_BOTTOM) {
-			obj.mx.y = position.b - mag/2 * y_sign
-		}
+    if (selected_dot.side & LEFT_RIGHT) {
+      obj.mx.x = position.a + cos(rotationY) * mag/2 * (x_sign)
+      obj.mx.z = position.c + sin(rotationY) * mag/2 * (x_sign)
+    }
+    if (selected_dot.side & TOP_BOTTOM) {
+      obj.mx.y = position.b - mag/2 * y_sign
+    }
 
 		base.move_dots()
 		
@@ -181,11 +194,26 @@ Scenery.resize = new function(){
 	function up (e, cursor){
     if (! dragging) return
 		dragging = false
-		selected_dot = null
 		if (! editor.permissions.resize) { return }
-		obj.scale = obj.mx.ops.scale = obj.mx.scale
-		obj.dimensions.assign(obj.naturalDimensions).mul(obj.scale)
 		
+		if (obj.type == "text") {
+      var newHeight = $(obj.mx.inner).height()
+      if (selected_dot.side & BOTTOM) {
+        obj.mx.y = position.b + (naturalDimensionCopy.b - newHeight) / 2 * obj.scale
+      }
+      else {
+        obj.mx.y = dots[0].y - newHeight/2*obj.scale
+      }
+      obj.mx.height = obj.media.height = naturalDimension.b = newHeight
+      dimension.a = naturalDimension.a * obj.scale
+      dimension.b = naturalDimension.b * obj.scale
+      base.move_dots()
+		}
+		else {
+      obj.scale = obj.mx.ops.scale = obj.mx.scale
+      obj.dimensions.assign(obj.naturalDimensions).mul(obj.scale)
+    }
+    		
     UndoStack.push({
       type: 'update-scenery',
       undo: oldState,
@@ -196,6 +224,7 @@ Scenery.resize = new function(){
     Minotaur.watch( app.router.editorView.settings )
 
 		document.body.classList.remove("dragging")
+		selected_dot = null
 	}
 
 }