quickcanvas identifies itself when rendered

Author: alcomposer

Source/Canvas.cpp

@@ -603,7 +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) {
     auto const halfSize = infiniteCanvasSize / 2;
     auto const zoom = getValue<float>(zoomScale);
     bool isLocked = getValue<bool>(locked);

Source/Canvas.h

@@ -98,7 +98,7 @@ class Canvas : public Component
     void focusLost(FocusChangeType cause) override;
 
     bool updateFramebuffers(NVGcontext* nvg, Rectangle<int> invalidRegion);
-    void performRender(NVGcontext* nvg, Rectangle<int> invalidRegion, bool isQuickCanvas = false);
+    void performRender(NVGcontext* nvg, Rectangle<int> invalidRegion);
 
     void resized() override;
 

Source/CanvasViewport.h

@@ -489,6 +489,8 @@ class CanvasViewport : public Viewport
 
                             cnv->quickCanvas->quickCanvasOffset = cnv->canvasOrigin - obj->getPosition().translated(Object::margin, Object::margin) + patch->getGraphBounds().getPosition();
 
+                            cnv->quickCanvas->grabKeyboardFocus();
+
                             cnv->resized();
                         }
                         return;

Source/NVGSurface.cpp

@@ -416,7 +416,7 @@ void NVGSurface::render()
                 nvgViewport(0, 0, fbWidth, fbHeight);
                 nvgBeginFrame(nvg, getWidth() * desktopScale, getHeight() * desktopScale, devicePixelScale);
                 nvgScale(nvg, desktopScale, desktopScale);
-                cnv->performRender(nvg, invalidArea, true);
+                cnv->performRender(nvg, invalidArea);
                 nvgGlobalScissor(nvg, invalidArea.getX() * pixelScale, invalidArea.getY() * pixelScale, invalidArea.getWidth() * pixelScale, invalidArea.getHeight() * pixelScale);
                 nvgEndFrame(nvg);
 

Source/TabComponent.cpp

@@ -578,32 +578,18 @@ SmallArray<Canvas*> TabComponent::getCanvases()
     return allCanvases;
 }
 
-void TabComponent::renderArea(NVGcontext* nvg, Rectangle<int> area, bool isQuickCanvas)
+void TabComponent::renderArea(NVGcontext* nvg, Rectangle<int> area)
 {
-    if (isQuickCanvas) {
-        if (splits[0]) {
-            NVGScopedState scopedState(nvg);
-            nvgScissor(nvg, 0, 0, splits[1] ? (splitSize - 3) : getWidth(), getHeight());
-            splits[0]->quickCanvas->performRender(nvg, area, true);
-        }
-        if (splits[1]) {
-            NVGScopedState scopedState(nvg);
-            nvgTranslate(nvg, splitSize + 3, 0);
-            nvgScissor(nvg, 0, 0, getWidth() - (splitSize + 3), getHeight());
-            splits[1]->quickCanvas->performRender(nvg, area.translated(-(splitSize + 3), 0), true);
-        }
-    } else {
-        if (splits[0]) {
-            NVGScopedState scopedState(nvg);
-            nvgScissor(nvg, 0, 0, splits[1] ? (splitSize - 3) : getWidth(), getHeight());
-            splits[0]->performRender(nvg, area);
-        }
-        if (splits[1]) {
-            NVGScopedState scopedState(nvg);
-            nvgTranslate(nvg, splitSize + 3, 0);
-            nvgScissor(nvg, 0, 0, getWidth() - (splitSize + 3), getHeight());
-            splits[1]->performRender(nvg, area.translated(-(splitSize + 3), 0));
-        }
+    if (splits[0]) {
+        NVGScopedState scopedState(nvg);
+        nvgScissor(nvg, 0, 0, splits[1] ? (splitSize - 3) : getWidth(), getHeight());
+        splits[0]->performRender(nvg, area);
+    }
+    if (splits[1]) {
+        NVGScopedState scopedState(nvg);
+        nvgTranslate(nvg, splitSize + 3, 0);
+        nvgScissor(nvg, 0, 0, getWidth() - (splitSize + 3), getHeight());
+        splits[1]->performRender(nvg, area.translated(-(splitSize + 3), 0));
     }
 
     if (!splitDropBounds.isEmpty()) {

Source/TabComponent.h

@@ -24,7 +24,7 @@ class TabComponent : public Component
 
     void openInPluginMode(pd::Patch::Ptr patch);
 
-    void renderArea(NVGcontext* nvg, Rectangle<int> bounds, bool isQuickCanvas = false);
+    void renderArea(NVGcontext* nvg, Rectangle<int> bounds);
 
     void nextTab();
     void previousTab();