X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=TargetMouseMove.m;h=52f241a0640952f8c16ea49276eea9c4c7a9e1e8;hp=893bbb6263e92f23e67dff295f4652a159ea13b2;hb=62aa5b73be6ec1e499e6b155cd0e7687c338cbaa;hpb=16a7c0a04bd05f4012d5a97a53520802969cfc86 diff --git a/TargetMouseMove.m b/TargetMouseMove.m index 893bbb6..52f241a 100644 --- 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;