Rename from Enjoy/Enjoy2 to 'Enjoyable'. While I'm mucking in the project file, enabl...

[enjoyable.git] / TargetMouseMove.m

diff --git a/TargetMouseMove.m b/TargetMouseMove.m
index 893bbb6..52f241a 100644 (file)
--- a/TargetMouseMove.m
+++ b/TargetMouseMove.m
@@ -18,14 +18,12 @@
     return YES;
 }
 
-@synthesize axis;
-
 + (NSString *)serializationCode {
     return @"mmove";
 }
 
 - (NSDictionary *)serialize {
-    return @{ @"type": @"mmove", @"axis": @(self.axis) };
+    return @{ @"type": @"mmove", @"axis": @(_axis) };
 }
 
 + (Target *)targetDeserialize:(NSDictionary *)serialization
@@ -50,14 +48,14 @@
     }
     
     NSRect screenRect = [[NSScreen mainScreen] frame];
-    NSInteger height = screenRect.size.height;
+    CGFloat height = screenRect.size.height;
     
     // TODO
     float speed = 4.f;
     if ([jc frontWindowOnly])
         speed = 12.f;
     float dx = 0.f, dy = 0.f;
-    if (axis == 0)
+    if (_axis == 0)
         dx = self.magnitude * speed;
     else
         dy = self.magnitude * speed;
@@ -70,8 +68,8 @@
                                               CGPointMake(mouseLoc.x, height - mouseLoc.y),
                                               0);
     CGEventSetType(move, kCGEventMouseMoved);
-    CGEventSetIntegerValueField(move, kCGMouseEventDeltaX, dx);
-    CGEventSetIntegerValueField(move, kCGMouseEventDeltaY, dy);
+    CGEventSetIntegerValueField(move, kCGMouseEventDeltaX, (int)dx);
+    CGEventSetIntegerValueField(move, kCGMouseEventDeltaY, (int)dy);
     
     if ([jc frontWindowOnly]) {
         ProcessSerialNumber psn;