diff --git a/CocoaSplit.xcodeproj/project.xcworkspace/xcuserdata/zakk.xcuserdatad/UserInterfaceState.xcuserstate b/CocoaSplit.xcodeproj/project.xcworkspace/xcuserdata/zakk.xcuserdatad/UserInterfaceState.xcuserstate index e91ecce9..2b63d1d3 100644 Binary files a/CocoaSplit.xcodeproj/project.xcworkspace/xcuserdata/zakk.xcuserdatad/UserInterfaceState.xcuserstate and b/CocoaSplit.xcodeproj/project.xcworkspace/xcuserdata/zakk.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/CocoaSplit/CaptureController.m b/CocoaSplit/CaptureController.m index 9752c133..04a8351e 100644 --- a/CocoaSplit/CaptureController.m +++ b/CocoaSplit/CaptureController.m @@ -1411,6 +1411,8 @@ newCompressor.vbv_buffer = 1000; newCompressor.vbv_maxrate = 1000; newCompressor.keyframe_interval = 2; + newCompressor.crf = 23; + newCompressor.use_cbr = YES; self.compressors[@"x264"] = newCompressor; [[NSNotificationCenter defaultCenter] postNotificationName:CSNotificationCompressorAdded object:newCompressor]; diff --git a/CocoaSplit/PreviewView.m b/CocoaSplit/PreviewView.m index 0a8388a5..faa068a3 100644 --- a/CocoaSplit/PreviewView.m +++ b/CocoaSplit/PreviewView.m @@ -727,17 +727,33 @@ _inDrag = YES; tmp = [self convertPoint:theEvent.locationInWindow fromView:nil]; + //NSLog(@"DELTA X %f Y %f", theEvent.deltaX, theEvent.deltaY); + worldPoint = [self realPointforWindowPoint:tmp]; - CGFloat dx, dy; - dx = worldPoint.x - self.selectedOriginDistance.x; - dy = worldPoint.y - self.selectedOriginDistance.y; + dx = (worldPoint.x - self.selectedOriginDistance.x); + dy = (worldPoint.y - self.selectedOriginDistance.y); + + [self adjustDeltas:&dx dy:&dy]; self.selectedOriginDistance = worldPoint; + + if (theEvent.deltaX == 0) + { + dx = 0; + } + + if (theEvent.deltaY == 0) + { + dy = 0; + } + + //NSLog(@"DX %f DY %f", dx, dy); + if (self.isResizing) { if (theEvent.modifierFlags & NSShiftKeyMask) @@ -794,7 +810,6 @@ if (self.resizeType & kResizeLeft) { new_width -= dx; - }