diff Framework/Scene2DViewport/LayerHolder.h @ 1331:ab81ee8fce1f broker

- Viewport is not passed and stored as a shared_ptr instead of raw reference. - ViewportController can now be injected with an undo stack (not a ctor param anymore, as a preparation for the move of the undo stack to an interactor) - Added (temp) flag to disable emscripten events registration in the WebAssemblyViewport (because legacy client code deals with them directly) - Added emscripten_clear_timeout in ~WebGLViewportsRegistry - Removed GenericToolbox::HoldingRef whose responsibility is better served with proper callback un-registration.
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 30 Mar 2020 14:23:46 +0200
parents a5326ce4f24b
children 2a11bbf7f6b0
line wrap: on
line diff
--- a/Framework/Scene2DViewport/LayerHolder.h	Mon Mar 30 08:47:30 2020 +0200
+++ b/Framework/Scene2DViewport/LayerHolder.h	Mon Mar 30 14:23:46 2020 +0200
@@ -43,7 +43,7 @@
     performed at this time
     */
     LayerHolder(
-      IViewport& viewport,
+      boost::shared_ptr<IViewport> viewport,
       int polylineLayerCount, int textLayerCount, int infoTextCount = 0);
 
     /**
@@ -101,7 +101,7 @@
     int textLayerCount_;
     int polylineLayerCount_;
     int infoTextCount_;
-    IViewport& viewport_;
+    boost::shared_ptr<IViewport> viewport_;
     int baseLayerIndex_;
   };
 }