mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #22601 from cpoerschke:4.x-issue-22595

Browse Source
This commit is contained in:
Alexander Alekhin 2022-10-30 16:49:01 +00:00
commit 87360c2ae5
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/highgui/src/precomp.hpp
View File

@ -114,6 +114,7 @@ double cvGetOpenGlProp_W32(const char* name);
double cvGetOpenGlProp_GTK(const char* name); double cvGetOpenGlProp_GTK(const char* name);
double cvGetPropVisible_W32(const char* name); double cvGetPropVisible_W32(const char* name);
double cvGetPropVisible_COCOA(const char* name);
double cvGetPropTopmost_W32(const char* name); double cvGetPropTopmost_W32(const char* name);
double cvGetPropTopmost_COCOA(const char* name); double cvGetPropTopmost_COCOA(const char* name);

2
modules/highgui/src/window.cpp
View File

@ -366,6 +366,8 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
return cvGetPropVisible_QT(name); return cvGetPropVisible_QT(name);
#elif defined(HAVE_WIN32UI) #elif defined(HAVE_WIN32UI)
return cvGetPropVisible_W32(name); return cvGetPropVisible_W32(name);
#elif defined(HAVE_COCOA)
return cvGetPropVisible_COCOA(name);
#else #else
return -1; return -1;
#endif #endif

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

@ -740,6 +740,31 @@ void cvSetModeWindow_COCOA( const char* name, double prop_value )
__END__; __END__;
} }
double cvGetPropVisible_COCOA(const char* name)
{
double result = -1;
CVWindow* window = nil;
CV_FUNCNAME("cvGetPropVisible_COCOA");
__BEGIN__;
if (name == NULL)
{
CV_ERROR(CV_StsNullPtr, "NULL name string");
}
window = cvGetWindow(name);
if (window == NULL)
{
CV_ERROR(CV_StsNullPtr, "NULL window");
}
result = window.isVisible ? 1 : 0;
__END__;
return result;
}
double cvGetPropTopmost_COCOA(const char* name) double cvGetPropTopmost_COCOA(const char* name)
{ {
double result = -1; double result = -1;