Permalink
Browse files

Merge pull request #414 from koenbok/feature/DefaultCursor

Show arrow cursor by default when using computer devices
  • Loading branch information...
jonastreub committed Sep 3, 2016
2 parents f183c8c + 1869a64 commit 94ccc0496cee94ebdb9c4e9c113d51b25a465519
@@ -1,2 +0,0 @@
Framer.Device.deviceType = "sony-w85Oc"
Screen.backgroundColor = "28affa"
@@ -5,7 +5,7 @@
"deviceOrientation" : 0,
"sharedPrototype" : 1,
"contentScale" : 1,
"deviceType" : "custom",
"deviceType" : "apple-macbook",
"selectedHand" : "",
"updateDelay" : 0.3,
"deviceScale" : "fit",
@@ -62,7 +62,7 @@ class exports.DeviceComponent extends BaseClass
@Type =
Tablet: "tablet"
Phone: "phone"
Browser: "browser"
Computer: "computer"
_setup: ->
@@ -266,6 +266,10 @@ class exports.DeviceComponent extends BaseClass
@screen.backgroundColor = "black"
@screen.backgroundColor = device.backgroundColor if device.backgroundColor?
if device.deviceType is "computer"
Utils.domComplete ->
document.body.style.cursor = "auto"
@_device = _.clone(device)
@_deviceType = deviceType
@fullscreen = false
@@ -865,6 +869,7 @@ AppleMacBook =
deviceImageCompression: true
screenWidth: 2304
screenHeight: 1440
deviceType: "computer"
minStudioVersion: newDeviceMinVersion
AppleMacBookAir =
@@ -873,6 +878,7 @@ AppleMacBookAir =
deviceImageCompression: true
screenWidth: 1440
screenHeight: 900
deviceType: "computer"
minStudioVersion: newDeviceMinVersion
AppleMacBookPro =
@@ -881,6 +887,7 @@ AppleMacBookPro =
deviceImageCompression: true
screenWidth: 2880
screenHeight: 1800
deviceType: "computer"
minStudioVersion: newDeviceMinVersion
AppleIMac =
@@ -889,6 +896,7 @@ AppleIMac =
deviceImageCompression: true
screenWidth: 2560
screenHeight: 1440
deviceType: "computer"
minStudioVersion: newDeviceMinVersion
DellXPS =
@@ -897,6 +905,7 @@ DellXPS =
deviceImageCompression: true
screenWidth: 3840
screenHeight: 2160
deviceType: "computer"
minStudioVersion: newDeviceMinVersion
SonyW85OC =

0 comments on commit 94ccc04

Please sign in to comment.