summaryrefslogtreecommitdiffstats
path: root/video/out/cocoa
diff options
context:
space:
mode:
authorAkemi <der.richter@gmx.de>2017-05-19 17:44:20 +0200
committerAkemi <der.richter@gmx.de>2017-05-19 19:19:29 +0200
commit37f0571973cc0f9f3884b2b45293e0a2c5a6ae23 (patch)
treeab16c1d968d65b629576849787914e6555b3e9f1 /video/out/cocoa
parent7aa070e1cb3fcb1b1c8b91f3b324c45dd481368f (diff)
downloadmpv-37f0571973cc0f9f3884b2b45293e0a2c5a6ae23.tar.bz2
mpv-37f0571973cc0f9f3884b2b45293e0a2c5a6ae23.tar.xz
cocoa: properly unhide Dock when quitting during System fs animation
when quitting mpv during the System fullscreen animation cocoa can't reset some flags properly and won't reset the Dock hiding behaviour to it's previous state. Fixes #4400
Diffstat (limited to 'video/out/cocoa')
-rw-r--r--video/out/cocoa/window.m12
1 files changed, 12 insertions, 0 deletions
diff --git a/video/out/cocoa/window.m b/video/out/cocoa/window.m
index d26d7272a6..5656428936 100644
--- a/video/out/cocoa/window.m
+++ b/video/out/cocoa/window.m
@@ -159,16 +159,28 @@
[self.adapter windowDidExitFullScreen:notification];
}
+- (void)windowWillEnterFullScreen:(NSNotification *)notification
+{
+ [self.adapter windowWillEnterFullScreen:notification];
+}
+
+- (void)windowWillExitFullScreen:(NSNotification *)notification
+{
+ [self.adapter windowWillExitFullScreen:notification];
+}
+
- (void)windowDidFailToEnterFullScreen:(NSWindow *)window
{
_is_animating = 0;
[self setToWindow];
+ [self.adapter windowDidFailToEnterFullScreen:window];
}
- (void)windowDidFailToExitFullScreen:(NSWindow *)window
{
_is_animating = 0;
[self setToFullScreen];
+ [self.adapter windowDidFailToExitFullScreen:window];
}
- (void)windowDidChangeBackingProperties:(NSNotification *)notification