RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

cocoa: disallow the titlebar to exit the visibleFrame on the bottom edge

This commit is contained in:
Stefano Pigozzi 2014-04-01 19:14:15 +02:00
parent 2c08ab1c6a
commit 8eb7e2aa0b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
video/out/cocoa/window.m
View File

@ -127,17 +127,18 @@
if ([self isInFullScreenMode])
return [super constrainFrameRect:nf toScreen:screen];
NSRect cf = [self frame];
NSRect vf = [[self screen] visibleFrame];
NSRect of = [self frame];
NSRect vf = [[self screen] visibleFrame];
NSRect ncf = [self contentRectForFrameRect:nf];
// Prevent the window's titlebar from exiting the screen on the top edge.
// This introduces a 'snap to top' behaviour.
if (NSMaxY(nf) > NSMaxY(vf))
nf.origin.y = NSMaxY(vf) - NSHeight(nf);
// Prevent window from exiting the screen on the bottom edge
if (NSMaxY(nf) < NSMinY(vf))
nf.origin.y = NSMinY(vf);
// Prevent the window's titlebar from exiting the screen on the top edge.
if (NSMaxY(ncf) < NSMinY(vf))
nf.origin.y = NSMinY(vf) + NSMinY(ncf) - NSMaxY(ncf);
// Prevent window from exiting the screen on the right edge
if (NSMinX(nf) > NSMaxX(vf))
@ -147,7 +148,7 @@
if (NSMaxX(nf) < NSMinX(vf))
nf.origin.x = NSMinX(vf);
if (NSHeight(nf) < NSHeight(vf) && NSHeight(cf) > NSHeight(vf))
if (NSHeight(nf) < NSHeight(vf) && NSHeight(of) > NSHeight(vf))
// If the window height is smaller than the visible frame, but it was
// bigger previously recenter the smaller window vertically. This is
// needed to counter the 'snap to top' behaviour.