Quick canvas doesn't need viewport? Maybe not?...

Author: alcomposer

Source/Canvas.cpp

@@ -225,7 +225,7 @@ class ObjectsResizer : public Component, NVGComponent, Value::Listener {
     std::function<void(Point<int>)> onMove;
 };
 
-Canvas::Canvas(PluginEditor* parent, pd::Patch::Ptr p, Component* parentGraph)
+Canvas::Canvas(PluginEditor* parent, pd::Patch::Ptr p, Component* parentGraph, bool isQuickCanvas)
     : NVGComponent(this)
     , editor(parent)
     , pd(parent->pd)
@@ -235,6 +235,7 @@ Canvas::Canvas(PluginEditor* parent, pd::Patch::Ptr p, Component* parentGraph)
     , graphArea(nullptr)
     , pathUpdater(new ConnectionPathUpdater(this))
     , globalMouseListener(this)
+    , isQuickCanvas(isQuickCanvas)
 {
     selectedComponents.addChangeListener(this);
 
@@ -293,7 +294,7 @@ Canvas::Canvas(PluginEditor* parent, pd::Patch::Ptr p, Component* parentGraph)
     } else {
         isGraph = false;
     }
-    if (!isGraph) {
+    if (!isGraph && !isQuickCanvas) {
         auto* canvasViewport = new CanvasViewport(editor, this);
 
         canvasViewport->setViewedComponent(this, false);
@@ -397,7 +398,17 @@ Canvas::~Canvas()
     }
 
     saveViewportState();
+
     zoomScale.removeListener(this);
+    commandLocked.referTo(Value());
+    commandLocked.removeListener(this);
+    patchWidth.removeListener(this);
+    patchHeight.removeListener(this);
+    xRange.removeListener(this);
+    yRange.removeListener(this);
+    isGraphChild.removeListener(this);
+    hideNameAndArgs.removeListener(this);
+
     editor->removeModifierKeyListener(this);
     pd->unregisterMessageListener(this);
     patch.setVisible(false);
@@ -592,8 +603,7 @@ bool Canvas::updateFramebuffers(NVGcontext* nvg, Rectangle<int> invalidRegion)
 }
 
 // Callback from canvasViewport to perform actual rendering
-void Canvas::performRender(NVGcontext* nvg, Rectangle<int> invalidRegion, bool isQuickCanvas)
-{
+void Canvas::performRender(NVGcontext* nvg, Rectangle<int> invalidRegion, bool isQuickCanvas) {
     auto const halfSize = infiniteCanvasSize / 2;
     auto const zoom = getValue<float>(zoomScale);
     bool isLocked = getValue<bool>(locked);
@@ -818,15 +828,11 @@ void Canvas::performRender(NVGcontext* nvg, Rectangle<int> invalidRegion, bool i
 
     nvgRestore(nvg);
 
-    //if (quickCanvas) {
-    //    std::cout << "rendering quick canvas region: " << invalidRegion.toString() << std::endl;
-    //    quickCanvas->performRender(nvg, quickCanvas->getBounds(), true);
-    //}
-
-
     // Draw scrollbars
-    if (viewport && isQuickCanvas) {
+    if (viewport && !quickCanvas) {
         reinterpret_cast<CanvasViewport*>(viewport.get())->render(nvg);
+    } else if (isQuickCanvas) {
+        reinterpret_cast<CanvasViewport*>(findParentComponentOfClass<Canvas>()->viewport.get())->render(nvg);
     }
 }
 

Source/Canvas.h

@@ -69,7 +69,7 @@ class Canvas : public Component
     , public NVGComponent
     , public ChangeListener {
 public:
-    Canvas(PluginEditor* parent, pd::Patch::Ptr patch, Component* parentGraph = nullptr);
+    Canvas(PluginEditor* parent, pd::Patch::Ptr patch, Component* parentGraph = nullptr, bool isQuickCanvas = false);
 
     ~Canvas() override;
 

Source/CanvasViewport.h

@@ -383,6 +383,8 @@ class CanvasViewport : public Viewport
                     if (approximatelyEqual(0.0f, cnv->quickCanvas->quickCanvasAlpha)) {
                         stopTimer(Timers::QuickCanvasAnimationTimer);
 
+                        cnv->quickCanvas->zoomScale.referTo(Value());
+                        cnv->quickCanvas->locked.referTo(Value());
                         cnv->quickCanvas.reset();
                     }
                 }
@@ -476,7 +478,7 @@ class CanvasViewport : public Viewport
                         }
 
                         if (!cnv->quickCanvas) {
-                            cnv->quickCanvas = std::make_unique<Canvas>(editor, patch);
+                            cnv->quickCanvas = std::make_unique<Canvas>(editor, patch, nullptr, true);
                             cnv->addAndMakeVisible(cnv->quickCanvas.get());
 
                             cnv->quickCanvas->zoomScale.referTo(cnv->zoomScale);
@@ -485,8 +487,8 @@ class CanvasViewport : public Viewport
                             cnv->quickCanvas->locked.referTo(cnv->locked);
                             cnv->quickCanvas->locked.setValue(cnv->locked);
 
-                            cnv->quickCanvas->isQuickCanvas = true;
                             cnv->quickCanvas->quickCanvasOffset = cnv->canvasOrigin - obj->getPosition().translated(Object::margin, Object::margin) + patch->getGraphBounds().getPosition();
+
                             cnv->resized();
                         }
                         return;