Mercurial > hg > orthanc-stone
diff Framework/Viewport/WebAssemblyCairoViewport.cpp @ 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 | cbfdba08e039 |
children | 1b8e37770d78 |
line wrap: on
line diff
--- a/Framework/Viewport/WebAssemblyCairoViewport.cpp Mon Mar 30 08:47:30 2020 +0200 +++ b/Framework/Viewport/WebAssemblyCairoViewport.cpp Mon Mar 30 14:23:46 2020 +0200 @@ -122,12 +122,16 @@ } - WebAssemblyCairoViewport::WebAssemblyCairoViewport(const std::string& canvasId) : - WebAssemblyViewport(canvasId, NULL, boost::weak_ptr<UndoStack>()) + WebAssemblyCairoViewport::WebAssemblyCairoViewport( + const std::string& canvasId) : + WebAssemblyViewport(canvasId) { unsigned int width, height; GetCanvasSize(width, height); - emscripten_set_canvas_element_size(GetFullCanvasId().c_str(), width, height); + emscripten_set_canvas_element_size(GetFullCanvasId().c_str(), + width, + height); + AcquireCompositor(new CairoCompositor(width, height)); } }