OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0032991: Visualization, TKOpenGl - OpenGl_Window::Resize() ignores window virtual flag on macOS

Browse Source 
Added handling of Aspect_Window::IsVirtual() flag on macOS platform.
This commit is contained in:
kgv 2022-05-28 01:04:31 +03:00 committed by afokin
parent 48e4aad412
commit 812afe4edb
3 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Cocoa/Cocoa_Window.mm
View File

@ -436,15 +436,6 @@ void Cocoa_Window::InvalidateContent (const Handle(Aspect_DisplayConnection)& )
return; return;
} }
if ([NSThread isMainThread])
{
#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
[myHView setNeedsDisplay];
#else
[myHView setNeedsDisplay: YES];
#endif
}
else
{ {
[myHView performSelectorOnMainThread: @selector(invalidateContentOcct:) [myHView performSelectorOnMainThread: @selector(invalidateContentOcct:)
withObject: NULL withObject: NULL

76
src/OpenGl/OpenGl_Window_1.mm
View File

@ -274,11 +274,18 @@ OpenGl_Window::~OpenGl_Window()
void OpenGl_Window::Resize() void OpenGl_Window::Resize()
{ {
// If the size is not changed - do nothing // If the size is not changed - do nothing
Standard_Integer aWidthPt = 0; Graphic3d_Vec2i aWinSize;
Standard_Integer aHeightPt = 0; mySizeWindow->Size (aWinSize.x(), aWinSize.y());
mySizeWindow->Size (aWidthPt, aHeightPt); if (myPlatformWindow->IsVirtual()
if (mySizePt.x() == aWidthPt || mySizeWindow != myPlatformWindow)
&& mySizePt.y() == aHeightPt) {
if (mySize == aWinSize)
{
return;
}
mySize = aWinSize;
}
else if (mySizePt == aWinSize)
{ {
#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE #if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
return; return;
@ -303,8 +310,7 @@ void OpenGl_Window::Resize()
#endif #endif
} }
mySizePt.x() = aWidthPt; mySizePt = aWinSize;
mySizePt.y() = aHeightPt;
init(); init();
} }
@ -366,40 +372,42 @@ void OpenGl_Window::init()
aDefFbo->BindBuffer (myGlContext); aDefFbo->BindBuffer (myGlContext);
aDefFbo.Nullify(); aDefFbo.Nullify();
#else #else
NSOpenGLContext* aGLCtx = myGlContext->myGContext; if (!myPlatformWindow->IsVirtual()
Standard_DISABLE_DEPRECATION_WARNINGS && mySizeWindow == myPlatformWindow)
NSView* aView = [aGLCtx view];
Standard_ENABLE_DEPRECATION_WARNINGS
NSRect aBounds = [aView bounds];
// we should call this method each time when window is resized
[aGLCtx update];
if ([aView respondsToSelector: @selector(convertSizeToBacking:)])
{ {
NSSize aRes = [aView convertSizeToBacking: aBounds.size]; NSOpenGLContext* aGLCtx = myGlContext->myGContext;
mySize.x() = Standard_Integer(aRes.width); Standard_DISABLE_DEPRECATION_WARNINGS
mySize.y() = Standard_Integer(aRes.height); NSView* aView = [aGLCtx view];
Standard_ENABLE_DEPRECATION_WARNINGS
NSRect aBounds = [aView bounds];
// we should call this method each time when window is resized
[aGLCtx update];
if ([aView respondsToSelector: @selector(convertSizeToBacking:)])
{
NSSize aRes = [aView convertSizeToBacking: aBounds.size];
mySize.x() = Standard_Integer(aRes.width);
mySize.y() = Standard_Integer(aRes.height);
}
else
{
mySize.x() = Standard_Integer(aBounds.size.width);
mySize.y() = Standard_Integer(aBounds.size.height);
}
mySizePt.x() = Standard_Integer(aBounds.size.width);
mySizePt.y() = Standard_Integer(aBounds.size.height);
} }
else
{
mySize.x() = Standard_Integer(aBounds.size.width);
mySize.y() = Standard_Integer(aBounds.size.height);
}
mySizePt.x() = Standard_Integer(aBounds.size.width);
mySizePt.y() = Standard_Integer(aBounds.size.height);
#endif #endif
myGlContext->core11fwd->glDisable (GL_DITHER); myGlContext->core11fwd->glDisable (GL_DITHER);
myGlContext->core11fwd->glDisable (GL_SCISSOR_TEST); myGlContext->core11fwd->glDisable (GL_SCISSOR_TEST);
myGlContext->core11fwd->glViewport (0, 0, mySize.x(), mySize.y()); const Standard_Integer aViewport[4] = { 0, 0, mySize.x(), mySize.y() };
if (myGlContext->GraphicsLibrary() != Aspect_GraphicsLibrary_OpenGLES) myGlContext->ResizeViewport (aViewport);
myGlContext->SetDrawBuffer (GL_BACK);
if (myGlContext->core11ffp != NULL)
{ {
myGlContext->core11fwd->glDrawBuffer (GL_BACK); myGlContext->core11ffp->glMatrixMode (GL_MODELVIEW);
if (myGlContext->core11ffp != NULL)
{
myGlContext->core11ffp->glMatrixMode (GL_MODELVIEW);
}
} }
} }

4
src/ViewerTest/ViewerTest_EventManager.cxx
View File

@ -253,7 +253,7 @@ void ViewerTest_EventManager::handleViewRedraw (const Handle(AIS_InteractiveCont
&& (!aRedrawer.IsStarted() || aRedrawer.IsPaused())) && (!aRedrawer.IsStarted() || aRedrawer.IsPaused()))
{ {
myIsTmpContRedraw = true; myIsTmpContRedraw = true;
#if !defined(_WIN32) && !defined(__EMSCRIPTEN__) #if !defined(_WIN32) && !defined(__EMSCRIPTEN__) && !defined(__APPLE__)
aRedrawer.Start (theView, 60.0); aRedrawer.Start (theView, 60.0);
#endif #endif
} }
@ -269,7 +269,7 @@ void ViewerTest_EventManager::handleViewRedraw (const Handle(AIS_InteractiveCont
else if (myIsTmpContRedraw) else if (myIsTmpContRedraw)
{ {
myIsTmpContRedraw = false; myIsTmpContRedraw = false;
#ifndef _WIN32 #if !defined(_WIN32) && !defined(__APPLE__)
ViewerTest_ContinuousRedrawer& aRedrawer = ViewerTest_ContinuousRedrawer::Instance(); ViewerTest_ContinuousRedrawer& aRedrawer = ViewerTest_ContinuousRedrawer::Instance();
aRedrawer.Pause(); aRedrawer.Pause();
#endif #endif