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

pull/22726/head
Alexander Alekhin 2 years ago
commit 87360c2ae5
  1. 1
      modules/highgui/src/precomp.hpp
  2. 2
      modules/highgui/src/window.cpp
  3. 25
      modules/highgui/src/window_cocoa.mm

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

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

@ -740,6 +740,31 @@ void cvSetModeWindow_COCOA( const char* name, double prop_value )
__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 result = -1;

Loading…
Cancel
Save