diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2015-03-08 15:19:17 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-03-11 12:49:39 +0900 |
| commit | 46cc45223c66083a8518e4e1a688eda06d6d264c (patch) | |
| tree | a4902c56c81ab826a33f7fa69321fa8d750208ce /video/out/cocoa | |
| parent | 0e160123fd57abdee038f67943ba4310502ab7bc (diff) | |
| download | mpv-46cc45223c66083a8518e4e1a688eda06d6d264c.tar.bz2 mpv-46cc45223c66083a8518e4e1a688eda06d6d264c.tar.xz | |
cocoa: fix autohide in fullscreen
(cherry picked from commit 8ec9bce2d367541f9d3939f773b669beebd0be6d)
Diffstat (limited to 'video/out/cocoa')
| -rw-r--r-- | video/out/cocoa/events_view.m | 3 | ||||
| -rw-r--r-- | video/out/cocoa/mpvadapter.h | 2 | ||||
| -rw-r--r-- | video/out/cocoa/window.m | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/video/out/cocoa/events_view.m b/video/out/cocoa/events_view.m index 30fca1a332..42f48bf096 100644 --- a/video/out/cocoa/events_view.m +++ b/video/out/cocoa/events_view.m @@ -166,7 +166,8 @@ - (BOOL)canHideCursor { - return !self.hasMouseDown && [self containsMouseLocation]; + return !self.hasMouseDown && [self containsMouseLocation] + && [[self window] isKeyWindow]; } - (void)mouseEntered:(NSEvent *)event diff --git a/video/out/cocoa/mpvadapter.h b/video/out/cocoa/mpvadapter.h index c5a0579a96..5b87e89d04 100644 --- a/video/out/cocoa/mpvadapter.h +++ b/video/out/cocoa/mpvadapter.h @@ -18,7 +18,7 @@ #import <Cocoa/Cocoa.h> #include "video/out/vo.h" -@interface MpvCocoaAdapter : NSObject +@interface MpvCocoaAdapter : NSObject<NSWindowDelegate> - (void)setNeedsResize; - (void)signalMouseMovement:(NSPoint)point; - (void)putKeyEvent:(NSEvent*)event; diff --git a/video/out/cocoa/window.m b/video/out/cocoa/window.m index 75adbbecb5..14a3ba91c8 100644 --- a/video/out/cocoa/window.m +++ b/video/out/cocoa/window.m @@ -63,12 +63,12 @@ - (void)windowDidResignKey:(NSNotification *)notification { - [self.adapter didChangeMousePosition]; + [self.adapter windowDidResignKey:notification]; } - (void)windowDidBecomeKey:(NSNotification *)notification { - [self.adapter didChangeMousePosition]; + [self.adapter windowDidBecomeKey:notification]; } - (BOOL)canBecomeMainWindow { return YES; } |