From 8ec9bce2d367541f9d3939f773b669beebd0be6d Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Sun, 8 Mar 2015 15:19:17 +0100
Subject: cocoa: fix autohide in fullscreen

---
 video/out/cocoa/events_view.m | 3 ++-
 video/out/cocoa/mpvadapter.h  | 2 +-
 video/out/cocoa/window.m      | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'video/out/cocoa')

diff --git a/video/out/cocoa/events_view.m b/video/out/cocoa/events_view.m
index 7c8283ad72..6fec712a33 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; }
-- 
cgit v1.2.3