diff options
author | Akemi <der.richter@gmx.de> | 2016-12-15 23:06:04 +0100 |
---|---|---|
committer | Akemi <der.richter@gmx.de> | 2016-12-16 16:32:26 +0100 |
commit | 2b8b17402ed59815019b309051b277ba4de82f3b (patch) | |
tree | 5181d5fbe3621fcf7da6bbb055d1e72c54dd89b9 /video/out/cocoa | |
parent | aab98776f602a4bec1a74ee87eb829aadf6437ea (diff) | |
download | mpv-2b8b17402ed59815019b309051b277ba4de82f3b.tar.bz2 mpv-2b8b17402ed59815019b309051b277ba4de82f3b.tar.xz |
cocoa: cosmetic fixes
Diffstat (limited to 'video/out/cocoa')
-rw-r--r-- | video/out/cocoa/events_view.m | 23 | ||||
-rw-r--r-- | video/out/cocoa/video_view.m | 3 | ||||
-rw-r--r-- | video/out/cocoa/window.m | 6 |
3 files changed, 20 insertions, 12 deletions
diff --git a/video/out/cocoa/events_view.m b/video/out/cocoa/events_view.m index 53d1da86ff..d377597006 100644 --- a/video/out/cocoa/events_view.m +++ b/video/out/cocoa/events_view.m @@ -39,7 +39,8 @@ @synthesize tracker = _tracker; @synthesize hasMouseDown = _mouse_down; -- (id)initWithFrame:(NSRect)frame { +- (id)initWithFrame:(NSRect)frame +{ self = [super initWithFrame:frame]; if (self) { [self registerForDraggedTypes:@[NSFilenamesPboardType, @@ -96,21 +97,25 @@ { return [self.adapter mouseEnabled]; } -- (BOOL)acceptsFirstResponder { +- (BOOL)acceptsFirstResponder +{ return [self.adapter keyboardEnabled] || [self.adapter mouseEnabled]; } -- (BOOL)becomeFirstResponder { +- (BOOL)becomeFirstResponder +{ return [self.adapter keyboardEnabled] || [self.adapter mouseEnabled]; } - (BOOL)resignFirstResponder { return YES; } -- (void)keyDown:(NSEvent *)event { +- (void)keyDown:(NSEvent *)event +{ [self.adapter putKeyEvent:event]; } -- (void)keyUp:(NSEvent *)event { +- (void)keyUp:(NSEvent *)event +{ [self.adapter putKeyEvent:event]; } @@ -298,10 +303,11 @@ NSPasteboard *pboard = [sender draggingPasteboard]; NSArray *types = [pboard types]; if ([types containsObject:NSFilenamesPboardType] || - [types containsObject:NSURLPboardType]) + [types containsObject:NSURLPboardType]) { return NSDragOperationCopy; - else + } else { return NSDragOperationNone; + } } - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender @@ -314,8 +320,7 @@ for (NSURL* url in pbitems) { if (url.fileURL) { [ar addObject:[url path]]; - } - else { + } else { [ar addObject:[url absoluteString]]; } } diff --git a/video/out/cocoa/video_view.m b/video/out/cocoa/video_view.m index 786c6ef4da..cb09dc8b9f 100644 --- a/video/out/cocoa/video_view.m +++ b/video/out/cocoa/video_view.m @@ -22,7 +22,8 @@ @implementation MpvVideoView @synthesize adapter = _adapter; -- (id)initWithFrame:(NSRect)frame { +- (id)initWithFrame:(NSRect)frame +{ self = [super initWithFrame:frame]; if (self) { [self setAutoresizingMask:NSViewWidthSizable|NSViewHeightSizable]; diff --git a/video/out/cocoa/window.m b/video/out/cocoa/window.m index 6d63263cb4..68e5222a03 100644 --- a/video/out/cocoa/window.m +++ b/video/out/cocoa/window.m @@ -309,7 +309,8 @@ _unfs_content_frame = [self frameRect:_unfs_content_frame forCenteredContentSize:newSize]; } -- (void)tryDequeueSize { +- (void)tryDequeueSize +{ if (_queued_video_size.width <= 0.0 || _queued_video_size.height <= 0.0) return; @@ -330,7 +331,8 @@ } } -- (void)windowDidBecomeMain:(NSNotification *)notification { +- (void)windowDidBecomeMain:(NSNotification *)notification +{ [self tryDequeueSize]; } @end |