diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-07-21 20:44:35 +0200 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-07-21 21:02:43 +0200 |
commit | 7c1d707f45263b519a07108f73afcf23a358cc3e (patch) | |
tree | c4df1b09c0dc675ccbbeaf381457b54995b43deb /video | |
parent | 50a84eb32dbb236f8f05babb84d2f3b70d525065 (diff) | |
download | mpv-7c1d707f45263b519a07108f73afcf23a358cc3e.tar.bz2 mpv-7c1d707f45263b519a07108f73afcf23a358cc3e.tar.xz |
cocoa_common: move tracking area setup to updateTrackingAreas
This makes the tracking area work when going in and out of fullscreen.
Diffstat (limited to 'video')
-rw-r--r-- | video/out/cocoa_common.m | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m index 9eab694d0d..7ec17420fc 100644 --- a/video/out/cocoa_common.m +++ b/video/out/cocoa_common.m @@ -819,23 +819,22 @@ int vo_cocoa_cgl_color_size(struct vo *vo) // as well without having to do any coordinate conversion of mouse positions. - (BOOL) isFlipped { return YES; } -- (id)initWithFrame:(NSRect)frame { - if (self = [super initWithFrame:frame]) { - NSTrackingAreaOptions trackingOptions = - NSTrackingEnabledDuringMouseDrag | - NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved | - NSTrackingActiveInActiveApp; +- (void)updateTrackingAreas +{ + if (self.tracker) [self removeTrackingArea:self.tracker]; - self.tracker = - [[[NSTrackingArea alloc] initWithRect:[self bounds] - options:trackingOptions - owner:self - userInfo:nil] autorelease]; + NSTrackingAreaOptions trackingOptions = + NSTrackingEnabledDuringMouseDrag | + NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved | + NSTrackingActiveInActiveApp; - [self addTrackingArea:self.tracker]; - } + self.tracker = + [[[NSTrackingArea alloc] initWithRect:[self bounds] + options:trackingOptions + owner:self + userInfo:nil] autorelease]; - return self; + [self addTrackingArea:self.tracker]; } - (NSPoint)mouseLocation |