From 812afe4edbbc3bb04834bd3c666b633bff5558d5 Mon Sep 17 00:00:00 2001
From: kgv <kgv@opencascade.com>
Date: Sat, 28 May 2022 01:04:31 +0300
Subject: [PATCH] 0032991: Visualization, TKOpenGl - OpenGl_Window::Resize()
 ignores window virtual flag on macOS

Added handling of Aspect_Window::IsVirtual() flag on macOS platform.
---
 src/Cocoa/Cocoa_Window.mm                  |  9 ---
 src/OpenGl/OpenGl_Window_1.mm              | 76 ++++++++++++----------
 src/ViewerTest/ViewerTest_EventManager.cxx |  4 +-
 3 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/src/Cocoa/Cocoa_Window.mm b/src/Cocoa/Cocoa_Window.mm
index d491b11e17..cd42e414eb 100644
--- a/src/Cocoa/Cocoa_Window.mm
+++ b/src/Cocoa/Cocoa_Window.mm
@@ -436,15 +436,6 @@ void Cocoa_Window::InvalidateContent (const Handle(Aspect_DisplayConnection)& )
     return;
   }
 
-  if ([NSThread isMainThread])
-  {
-  #if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
-    [myHView setNeedsDisplay];
-  #else
-    [myHView setNeedsDisplay: YES];
-  #endif
-  }
-  else
   {
     [myHView performSelectorOnMainThread: @selector(invalidateContentOcct:)
                               withObject: NULL
diff --git a/src/OpenGl/OpenGl_Window_1.mm b/src/OpenGl/OpenGl_Window_1.mm
index f1cc8c19d5..8e61ad112a 100644
--- a/src/OpenGl/OpenGl_Window_1.mm
+++ b/src/OpenGl/OpenGl_Window_1.mm
@@ -274,11 +274,18 @@ OpenGl_Window::~OpenGl_Window()
 void OpenGl_Window::Resize()
 {
   // If the size is not changed - do nothing
-  Standard_Integer aWidthPt  = 0;
-  Standard_Integer aHeightPt = 0;
-  mySizeWindow->Size (aWidthPt, aHeightPt);
-  if (mySizePt.x() == aWidthPt
-   && mySizePt.y() == aHeightPt)
+  Graphic3d_Vec2i aWinSize;
+  mySizeWindow->Size (aWinSize.x(), aWinSize.y());
+  if (myPlatformWindow->IsVirtual()
+   || mySizeWindow != myPlatformWindow)
+  {
+    if (mySize == aWinSize)
+    {
+      return;
+    }
+    mySize = aWinSize;
+  }
+  else if (mySizePt == aWinSize)
   {
   #if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
     return;
@@ -303,8 +310,7 @@ void OpenGl_Window::Resize()
   #endif
   }
 
-  mySizePt.x() = aWidthPt;
-  mySizePt.y() = aHeightPt;
+  mySizePt = aWinSize;
 
   init();
 }
@@ -366,40 +372,42 @@ void OpenGl_Window::init()
   aDefFbo->BindBuffer (myGlContext);
   aDefFbo.Nullify();
 #else
-  NSOpenGLContext* aGLCtx  = myGlContext->myGContext;
-Standard_DISABLE_DEPRECATION_WARNINGS
-  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:)])
+  if (!myPlatformWindow->IsVirtual()
+    && mySizeWindow == myPlatformWindow)
   {
-    NSSize aRes = [aView convertSizeToBacking: aBounds.size];
-    mySize.x() = Standard_Integer(aRes.width);
-    mySize.y() = Standard_Integer(aRes.height);
+    NSOpenGLContext* aGLCtx  = myGlContext->myGContext;
+  Standard_DISABLE_DEPRECATION_WARNINGS
+    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
 
   myGlContext->core11fwd->glDisable (GL_DITHER);
   myGlContext->core11fwd->glDisable (GL_SCISSOR_TEST);
-  myGlContext->core11fwd->glViewport (0, 0, mySize.x(), mySize.y());
-  if (myGlContext->GraphicsLibrary() != Aspect_GraphicsLibrary_OpenGLES)
+  const Standard_Integer aViewport[4] = { 0, 0, mySize.x(), mySize.y() };
+  myGlContext->ResizeViewport (aViewport);
+  myGlContext->SetDrawBuffer (GL_BACK);
+  if (myGlContext->core11ffp != NULL)
   {
-    myGlContext->core11fwd->glDrawBuffer (GL_BACK);
-    if (myGlContext->core11ffp != NULL)
-    {
-      myGlContext->core11ffp->glMatrixMode (GL_MODELVIEW);
-    }
+    myGlContext->core11ffp->glMatrixMode (GL_MODELVIEW);
   }
 }
 
diff --git a/src/ViewerTest/ViewerTest_EventManager.cxx b/src/ViewerTest/ViewerTest_EventManager.cxx
index d3fae9c88e..2bb2362f35 100644
--- a/src/ViewerTest/ViewerTest_EventManager.cxx
+++ b/src/ViewerTest/ViewerTest_EventManager.cxx
@@ -253,7 +253,7 @@ void ViewerTest_EventManager::handleViewRedraw (const Handle(AIS_InteractiveCont
      && (!aRedrawer.IsStarted() || aRedrawer.IsPaused()))
     {
       myIsTmpContRedraw = true;
-    #if !defined(_WIN32) && !defined(__EMSCRIPTEN__)
+    #if !defined(_WIN32) && !defined(__EMSCRIPTEN__) && !defined(__APPLE__)
       aRedrawer.Start (theView, 60.0);
     #endif
     }
@@ -269,7 +269,7 @@ void ViewerTest_EventManager::handleViewRedraw (const Handle(AIS_InteractiveCont
   else if (myIsTmpContRedraw)
   {
     myIsTmpContRedraw = false;
-  #ifndef _WIN32
+  #if !defined(_WIN32) && !defined(__APPLE__)
     ViewerTest_ContinuousRedrawer& aRedrawer = ViewerTest_ContinuousRedrawer::Instance();
     aRedrawer.Pause();
   #endif