cocoa_common: move tracking area setup to updateTrackingAreas

This makes the tracking area work when going in and out of fullscreen.
This commit is contained in:
Stefano Pigozzi 2013-07-21 20:44:35 +02:00
parent 50a84eb32d
commit 7c1d707f45
1 changed files with 13 additions and 14 deletions

View File

@ -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