Got rotation playing nicely with new scale behavior

tantaman · Jun 19, 2012 · 544111f · 544111f
1 parent 00c1712
commit 544111f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/client/src/ui/editor/components/ComponentView.coffee b/client/src/ui/editor/components/ComponentView.coffee
@@ -7,7 +7,7 @@ define(["vendor/backbone",
 		"css!../res/css/ComponentView.css"],
 (Backbone, DeltaDragControl, Templates, empty) ->
 	Backbone.View.extend(
-		transforms: ["skewX", "skewY", "rotate"]
+		transforms: ["skewX", "skewY"]
 		className: "component"
 		# TODO: make this junk less verbose
 		# and more common
@@ -125,6 +125,7 @@ define(["vendor/backbone",
 					height: newHeight)
 
 			@$contentScale.css(window.browserPrefix + "transform", "scale(" + scale + ")") 
+			@$el.css(window.browserPrefix + "transform", "rotate(" + @model.get("rotate") + "rad)")
 
 
 			# TODO: just use the transform matrix...

diff --git a/client/web/scripts/ui/editor/components/ComponentView.js b/client/web/scripts/ui/editor/components/ComponentView.js
diff --git a/client/web/scripts/ui/editor/res/css/ComponentView.css b/client/web/scripts/ui/editor/res/css/ComponentView.css
@@ -8,6 +8,12 @@
 	-moz-transform-origin: 0 0;
 }
 
+.component .content {
+	-webkit-transform-origin: 50% 50%;
+	-moz-transform-origin: 50% 50%;
+	transform-origin: 50% 50%;
+}
+
 .component.selected .label {
 	visibility: visible;
 }