mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-11 03:33:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24098 from 0xMihir:4.x

Browse Source 
Fix fullscreen behavior for macOS
This commit is contained in:
Alexander Smorkalov 2023-09-04 16:48:04 +03:00 committed by GitHub
commit e274e72869
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/highgui/src/window_cocoa.mm
View File

@ -195,6 +195,9 @@ CV_IMPL void cvDestroyWindow( const char* name)
//cout << "cvDestroyWindow" << endl; //cout << "cvDestroyWindow" << endl;
CVWindow *window = cvGetWindow(name); CVWindow *window = cvGetWindow(name);
if(window) { if(window) {
if ([window styleMask] & NSFullScreenWindowMask) {
[window toggleFullScreen:nil];
}
[window close]; [window close];
[windows removeObjectForKey:[NSString stringWithFormat:@"%s", name]]; [windows removeObjectForKey:[NSString stringWithFormat:@"%s", name]];
} }
@ -701,7 +704,11 @@ double cvGetModeWindow_COCOA( const char* name )
void cvSetModeWindow_COCOA( const char* name, double prop_value ) void cvSetModeWindow_COCOA( const char* name, double prop_value )
{ {
CVWindow *window = nil; CVWindow *window = nil;
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
NSDictionary *fullscreenOptions = nil; NSDictionary *fullscreenOptions = nil;
#endif
NSAutoreleasePool* localpool = nil; NSAutoreleasePool* localpool = nil;
CV_FUNCNAME( "cvSetModeWindow_COCOA" ); CV_FUNCNAME( "cvSetModeWindow_COCOA" );
@ -725,6 +732,31 @@ void cvSetModeWindow_COCOA( const char* name, double prop_value )
localpool = [[NSAutoreleasePool alloc] init]; localpool = [[NSAutoreleasePool alloc] init];
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_6
if ( ([window styleMask] & NSFullScreenWindowMask) && prop_value==CV_WINDOW_NORMAL )
{
[window toggleFullScreen:nil];
window.status=CV_WINDOW_NORMAL;
}
else if( !([window styleMask] & NSFullScreenWindowMask) && prop_value==CV_WINDOW_FULLSCREEN )
{
[window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
NSScreen* screen = [window screen];
NSRect frame = [screen frame];
[window setFrame:frame display:YES];
[window setContentSize:frame.size];
[window toggleFullScreen:nil];
[window setFrameTopLeftPoint: frame.origin];
window.status=CV_WINDOW_FULLSCREEN;
}
#else
fullscreenOptions = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:YES] forKey:NSFullScreenModeSetting]; fullscreenOptions = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:YES] forKey:NSFullScreenModeSetting];
if ( [[window contentView] isInFullScreenMode] && prop_value==CV_WINDOW_NORMAL ) if ( [[window contentView] isInFullScreenMode] && prop_value==CV_WINDOW_NORMAL )
{ {
@ -736,7 +768,7 @@ void cvSetModeWindow_COCOA( const char* name, double prop_value )
[[window contentView] enterFullScreenMode:[NSScreen mainScreen] withOptions:fullscreenOptions]; [[window contentView] enterFullScreenMode:[NSScreen mainScreen] withOptions:fullscreenOptions];
window.status=CV_WINDOW_FULLSCREEN; window.status=CV_WINDOW_FULLSCREEN;
} }
#endif
[localpool drain]; [localpool drain];
__END__; __END__;
@ -810,7 +842,7 @@ void cvSetPropTopmost_COCOA( const char* name, const bool topmost )
CV_ERROR( CV_StsNullPtr, "NULL window" ); CV_ERROR( CV_StsNullPtr, "NULL window" );
} }
if ([[window contentView] isInFullScreenMode]) if (([window styleMask] & NSFullScreenWindowMask))
{ {
EXIT; EXIT;
} }