Open quickcanvas as a tab if scroll-up on an active quickcanvas

Author: alcomposer

Source/CanvasViewport.h

@@ -396,13 +396,19 @@ class CanvasViewport : public Viewport
 
                         //removeMouseListener(cnv->quickCanvas.get());
                         cnv->quickCanvas.reset();
+                        editor->getTabComponent().repaint();
                     }
                 }
                 cnv->repaint();
                 if (cnv->quickCanvas) {
                     cnv->quickCanvas->repaint();
                 }
             } break;
+            case Timers::QuickCanvasBlock: {
+                quickCanvasBlocked = false;
+                stopTimer(Timers::QuickCanvasBlock);
+
+            } break;
         }
     }
 
@@ -491,7 +497,16 @@ class CanvasViewport : public Viewport
                 quickCanvasShowingOrHiding = true;
             }
             if (cnv->quickCanvas && quickCanvasShowingOrHiding) {
-                // TODO: Enter quick canvas, replace the current canvas with the quick canvas completely
+                if (quickCanvasBlocked) {
+                    startTimer(Timers::QuickCanvasBlock, 1000 / 5);
+                    quickCanvasBlocked = true;
+                    quickCanvasTimerCount = 0;
+                    return;
+                }
+                editor->getTabComponent().openPatch(cnv->quickCanvas->patch);
+                cnv->quickCanvas.reset();
+                editor->getTabComponent().repaint();
+                return;
             }
             if (!cnv->quickCanvas && quickCanvasShowingOrHiding) {
                 for (auto obj: cnv->objects) {
@@ -518,6 +533,9 @@ class CanvasViewport : public Viewport
                             cnv->quickCanvas->grabKeyboardFocus();
 
                             cnv->resized();
+                            editor->getTabComponent().repaint();
+                            startTimer(Timers::QuickCanvasBlock, 1000 / 5);
+                            quickCanvasBlocked = true;
                             return;
                         }
                     }
@@ -669,9 +687,10 @@ class CanvasViewport : public Viewport
     std::function<void()> onScroll = []() { };
 
 private:
-    enum Timers { ResizeTimer, AnimationTimer, QuickCanvasTimer, QuickCanvasAnimationTimer };
+    enum Timers { ResizeTimer, AnimationTimer, QuickCanvasTimer, QuickCanvasAnimationTimer, QuickCanvasBlock };
     int quickCanvasTimerCount = 0;
     bool quickCanvasShowingOrHiding = false;
+    bool quickCanvasBlocked = false;
 
     Point<int> startPos;
     Point<int> targetPos;

Source/TabComponent.h

@@ -167,10 +167,13 @@ class TabComponent : public Component
             g.setGradientFill(ColourGradient(textColour, fadeX - 18, area.getY(), Colours::transparentBlack, fadeX, area.getY(), false));
 
             if (cnv) {
+                auto quickCanvasText = cnv->quickCanvas ? cnv->quickCanvas->patch.getTitle() + (cnv->quickCanvas->patch.isDirty() ? String("*") : String()) : String();
                 auto text = cnv->patch.getTitle() + (cnv->patch.isDirty() ? String("*") : String());
 
+                auto formatedText = text + (quickCanvasText.isNotEmpty() ? String("  >  ") + quickCanvasText : "");
+
                 g.setFont(Fonts::getCurrentFont().withHeight(14.0f));
-                g.drawText(text, area.reduced(4, 0), Justification::centred, false);
+                g.drawText(formatedText, area.reduced(4, 0), Justification::centred, false);
             }
         }