Fix rotation bug with device

koenbok · Jan 14, 2015 · 45d792d · 45d792d
1 parent f932e94
commit 45d792d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/extras/CactusFramer/static/app.coffee b/extras/CactusFramer/static/app.coffee
@@ -1,2 +1,6 @@
 Framer.Device = new Framer.DeviceView()
-Framer.Device.setupContext()
+Framer.Device.setupContext()
+
+layer = new Layer width:10000, height:10000
+
+Framer.Device.rotateRight()
diff --git a/framer/DeviceView.coffee b/framer/DeviceView.coffee
@@ -403,19 +403,28 @@ class exports.DeviceView extends BaseClass
 		@phone.animateStop()
 		@viewport.animateStop()
 
+		# FIXME: After a rotation we call _update() again to set all the right
+		# dimensions, but these should be correctly animated instead of set after
+		# the animation.
+
 		if animate
 			animation = @phone.animate _.extend @animationOptions,
 				properties: phoneProperties
 			@viewport.animate _.extend @animationOptions,
 				properties: contentProperties
+
+			animation.on Events.AnimationEnd, =>
+				@_update()
 
 			if _hadKeyboard
 				animation.on Events.AnimationEnd, =>
 					@showKeyboard(true)
+
 		else
 			@phone.properties = phoneProperties
 			@viewport.properties = contentProperties
-
+			@_update()
+
 			if _hadKeyboard
 				@showKeyboard(true)