Store all colour as bgra for free conversion between nvgColor and juce::Colour

Author: timothyschoen

Libraries/nanovg

@@ -168,10 +168,10 @@ class ObjectsResizer final : public Component
     {
         // draw background and outline
         auto const b = getBounds().reduced(tabMargin);
-        auto iCol = cnv->selectedOutlineCol;
+        auto iCol = nvgColour(PlugDataColours::objectSelectedOutlineColour);
 
         iCol.a = 5; // Make the inner colour semi-transparent
-        nvgDrawRoundedRect(nvg, b.getX(), b.getY(), b.getWidth(), b.getHeight(), iCol, cnv->selectedOutlineCol, Corners::objectCornerRadius);
+        nvgDrawRoundedRect(nvg, b.getX(), b.getY(), b.getWidth(), b.getHeight(), iCol, nvgColour(PlugDataColours::objectSelectedOutlineColour), Corners::objectCornerRadius);
 
         // Draw handles at edge
         auto getCorners = [this] {
@@ -195,7 +195,7 @@ class ObjectsResizer final : public Component
 
             nvgBeginPath(nvg);
             nvgRect(nvg, 0, 0, 9, 9);
-            nvgFillPaint(nvg, nvgImageAlphaPattern(nvg, 0, 0, 9, 9, 0, resizeHandleImage.getImageId(), cnv->selectedOutlineCol));
+            nvgFillPaint(nvg, nvgImageAlphaPattern(nvg, 0, 0, 9, 9, 0, resizeHandleImage.getImageId(), nvgColour(PlugDataColours::objectSelectedOutlineColour)));
             nvgFill(nvg);
             angle -= 90;
         }
@@ -424,57 +424,6 @@ void Canvas::changeListenerCallback(ChangeBroadcaster* c)
 
 void Canvas::lookAndFeelChanged()
 {
-    // Canvas colours
-    canvasBackgroundColJuce = PlugDataColours::canvasBackgroundColour;
-    canvasBackgroundCol = nvgColour(canvasBackgroundColJuce);
-    canvasMarkingsColJuce = PlugDataColours::canvasDotsColour.interpolatedWith(canvasBackgroundColJuce, 0.2f);
-    canvasMarkingsCol = nvgColour(canvasMarkingsColJuce);
-    canvasTextColJuce = PlugDataColours::canvasTextColour;
-
-    // Object colours
-    objectOutlineCol = nvgColour(PlugDataColours::objectOutlineColour);
-    outlineCol = nvgColour(PlugDataColours::outlineColour);
-    textObjectBackgroundCol = nvgColour(PlugDataColours::textObjectBackgroundColour);
-    ioletLockedCol = nvgColour(canvasBackgroundColJuce.contrasting(0.5f));
-
-    commentTextCol = nvgColour(PlugDataColours::commentTextColour);
-
-    guiObjectInternalOutlineColJuce = PlugDataColours::guiObjectInternalOutlineColour;
-    guiObjectInternalOutlineCol = nvgColour(guiObjectInternalOutlineColJuce);
-    guiObjectBackgroundColJuce = PlugDataColours::guiObjectBackgroundColour;
-    guiObjectBackgroundCol = nvgColour(guiObjectBackgroundColJuce);
-
-    auto const selectedColJuce = PlugDataColours::objectSelectedOutlineColour;
-    selectedOutlineCol = nvgColour(selectedColJuce);
-    transparentObjectBackgroundCol = nvgColour(canvasBackgroundColJuce.contrasting(0.35f).withAlpha(0.1f));
-    indexTextCol = nvgColour(selectedColJuce.contrasting());
-
-    graphAreaCol = nvgColour(PlugDataColours::graphAreaColour);
-
-    // Lasso colours
-    lassoCol = nvgColour(selectedColJuce.withAlpha(0.075f));
-    lassoOutlineCol = nvgColour(canvasBackgroundColJuce.interpolatedWith(selectedColJuce, 0.65f));
-
-    // Presentation mode colors
-    auto const presentationBackgroundColJuce = PlugDataColours::presentationBackgroundColour;
-    presentationBackgroundCol = nvgColour(presentationBackgroundColJuce);
-    presentationWindowOutlineCol = nvgColour(presentationBackgroundColJuce.contrasting(0.3f));
-
-    // Connection / Iolet colours
-    auto const dataColJuce = PlugDataColours::dataColour;
-    dataCol = nvgColour(dataColJuce);
-    auto const sigColJuce = PlugDataColours::signalColour;
-    sigCol = nvgColour(sigColJuce);
-    auto const gemColJuce = PlugDataColours::gemColour;
-    gemCol = nvgColour(gemColJuce);
-    auto const baseColJuce = PlugDataColours::connectionColour;
-    baseCol = nvgColour(baseColJuce);
-
-    dataColBrighter = nvgColour(dataColJuce.brighter());
-    sigColBrighter = nvgColour(sigColJuce.brighter());
-    gemColBrigher = nvgColour(gemColJuce.brighter());
-    baseColBrigher = nvgColour(baseColJuce.brighter());
-
     dotsLargeImage.setDirty(); // Make sure bg colour actually gets updated
 }
 
@@ -558,7 +507,8 @@ void Canvas::updateFramebuffers(NVGcontext* nvg)
             default: break;
             }
 
-            auto const majorDotColour = canvasMarkingsColJuce.withAlpha(std::min(zoom * 0.8f, 1.0f));
+            auto markingColour = PlugDataColours::canvasDotsColour.interpolatedWith(PlugDataColours::canvasBackgroundColour, 0.2f);
+            auto const majorDotColour = markingColour.withAlpha(std::min(zoom * 0.8f, 1.0f));
 
             g.setColour(majorDotColour);
             // Draw ellipses on the grid
@@ -571,15 +521,15 @@ void Canvas::updateFramebuffers(NVGcontext* nvg)
                             continue;
                         g.setColour(majorDotColour);
                         if (x % decim == 0 && y % decim == 0)
-                            g.setColour(canvasMarkingsColJuce);
+                            g.setColour(markingColour);
                     }
                     // Add half smallest dot offset so the dot isn't at the edge of the texture
                     // We remove this when we position the texture on the canvas
                     float const centerX = static_cast<float>(x) + 2.5f;
                     float const centerY = static_cast<float>(y) + 2.5f;
                     g.fillEllipse(centerX - ellipseRadius, centerY - ellipseRadius, ellipseRadius * 2.0f, ellipseRadius * 2.0f);
                 }
-            } }, NVGImage::RepeatImage, canvasBackgroundColJuce);
+            } }, NVGImage::RepeatImage, PlugDataColours::canvasBackgroundColour);
     }
 }
 
@@ -598,7 +548,7 @@ void Canvas::performRender(NVGcontext* nvg, Rectangle<int> invalidRegion)
         invalidRegion /= zoom;
 
         if (isLocked) {
-            nvgFillColor(nvg, canvasBackgroundCol);
+            nvgFillColor(nvg, nvgColour(PlugDataColours::canvasBackgroundColour));
             nvgFillRect(nvg, invalidRegion.getX(), invalidRegion.getY(), invalidRegion.getWidth(), invalidRegion.getHeight());
         } else {
             nvgBeginPath(nvg);
@@ -614,7 +564,7 @@ void Canvas::performRender(NVGcontext* nvg, Rectangle<int> invalidRegion)
                 // offset image texture by 2.5f so no dots are on the edge of the texture
                 nvgTranslate(nvg, canvasOrigin.x - 2.5f, canvasOrigin.x - 2.5f);
 
-                nvgFillColor(nvg, canvasBackgroundCol); // This fixes some glitches but I'm not sure why
+                nvgFillColor(nvg, nvgColour(PlugDataColours::canvasBackgroundColour)); // This fixes some glitches but I'm not sure why
                 nvgFill(nvg);
 
                 nvgFillPaint(nvg, nvgImagePattern(nvg, 0, 0, gridSizeCommon, gridSizeCommon, 0, dotsLargeImage.getImageId(), 1));
@@ -647,15 +597,15 @@ void Canvas::performRender(NVGcontext* nvg, Rectangle<int> invalidRegion)
                     nvgLineTo(nvg, pos.x, pos.y + borderHeight);
                 }
                 nvgLineStyle(nvg, NVG_LINE_SOLID);
-                nvgStrokeColor(nvg, canvasBackgroundCol);
+                nvgStrokeColor(nvg, nvgColour(PlugDataColours::canvasBackgroundColour));
                 nvgStrokeWidth(nvg, 8.0f);
                 nvgStroke(nvg);
 
-                nvgFillColor(nvg, canvasBackgroundCol);
+                nvgFillColor(nvg, nvgColour(PlugDataColours::canvasBackgroundColour));
                 nvgFillRect(nvg, pos.x - 1.0f, pos.y - 1.0f, 2, 2);
             }
 
-            nvgStrokeColor(nvg, canvasMarkingsCol);
+            nvgStrokeColor(nvg, nvgColour(PlugDataColours::canvasDotsColour.interpolatedWith(PlugDataColours::canvasBackgroundColour, 0.2f)));
             nvgStrokeWidth(nvg, 1.5f);
             nvgDashLength(nvg, 8.0f);
             nvgLineStyle(nvg, NVG_LINE_DASHED);
@@ -719,7 +669,7 @@ void Canvas::performRender(NVGcontext* nvg, Rectangle<int> invalidRegion)
             nvgRect(nvg, 0, 0, infiniteCanvasSize, infiniteCanvasSize);
             nvgPathWinding(nvg, NVG_HOLE);
             nvgRoundedRect(nvg, pos.getX(), pos.getY(), borderWidth, borderHeight, windowCorner);
-            nvgFillColor(nvg, presentationBackgroundCol);
+            nvgFillColor(nvg, nvgColour(PlugDataColours::presentationBackgroundColour));
             nvgFill(nvg);
 
             // background drop shadow to simulate a virtual plugin
@@ -735,7 +685,7 @@ void Canvas::performRender(NVGcontext* nvg, Rectangle<int> invalidRegion)
             }
             auto const shadowImage = nvgImageAlphaPattern(nvg, pos.getX() - shadowSize, pos.getY() - shadowSize, borderArea.getWidth(), borderArea.getHeight(), 0, presentationShadowImage.getImageId(), nvgColour(Colours::black));
 
-            nvgStrokeColor(nvg, presentationWindowOutlineCol);
+            nvgStrokeColor(nvg, nvgColour(PlugDataColours::presentationBackgroundColour.contrasting(0.3f)));
             nvgStrokeWidth(nvg, 0.5f / scale);
             nvgFillPaint(nvg, shadowImage);
             nvgFill(nvg);
@@ -769,7 +719,7 @@ void Canvas::performRender(NVGcontext* nvg, Rectangle<int> invalidRegion)
     if (viewport && lasso.isVisible() && !lasso.getBounds().isEmpty()) {
         auto lassoBounds = lasso.getBounds();
         lassoBounds = lassoBounds.withSize(jmax(lasso.getWidth(), 2), jmax(lasso.getHeight(), 2));
-        nvgDrawRoundedRect(nvg, lassoBounds.getX(), lassoBounds.getY(), lassoBounds.getWidth(), lassoBounds.getHeight(), lassoCol, lassoOutlineCol, 0.0f);
+        nvgDrawRoundedRect(nvg, lassoBounds.getX(), lassoBounds.getY(), lassoBounds.getWidth(), lassoBounds.getHeight(), nvgColour(PlugDataColours::objectSelectedOutlineColour.withAlpha(0.075f)), nvgColour(PlugDataColours::canvasBackgroundColour.interpolatedWith(PlugDataColours::objectSelectedOutlineColour, 0.65f)), 0.0f);
     }
 
     suggestor->renderAutocompletion(nvg);

Source/Canvas.cpp

@@ -275,51 +275,6 @@ class Canvas final : public Component
 
     NVGImage resizeHandleImage;
     NVGImage presentationShadowImage;
-
-    NVGcolor canvasBackgroundCol;
-    Colour canvasBackgroundColJuce;
-    NVGcolor canvasMarkingsCol;
-    Colour canvasMarkingsColJuce;
-
-    Colour canvasTextColJuce;
-    NVGcolor presentationBackgroundCol;
-    NVGcolor presentationWindowOutlineCol;
-
-    NVGcolor lassoCol;
-    NVGcolor lassoOutlineCol;
-
-    // objectOutlineColourId
-    NVGcolor objectOutlineCol;
-    NVGcolor outlineCol;
-
-    NVGcolor graphAreaCol;
-
-    NVGcolor commentTextCol;
-
-    // guiObjectInternalOutlineColour
-    Colour guiObjectInternalOutlineColJuce;
-    NVGcolor guiObjectInternalOutlineCol;
-    NVGcolor guiObjectBackgroundCol;
-    Colour guiObjectBackgroundColJuce;
-
-    NVGcolor textObjectBackgroundCol;
-    NVGcolor transparentObjectBackgroundCol;
-
-    // objectSelectedOutlineColourId
-    NVGcolor selectedOutlineCol;
-    NVGcolor indexTextCol;
-    NVGcolor ioletLockedCol;
-
-    NVGcolor baseCol;
-    NVGcolor dataCol;
-    NVGcolor sigCol;
-    NVGcolor gemCol;
-
-    NVGcolor dataColBrighter;
-    NVGcolor sigColBrighter;
-    NVGcolor gemColBrigher;
-    NVGcolor baseColBrigher;
-
 private:
     void changeListenerCallback(ChangeBroadcaster* c) override;
 

Source/Canvas.h

@@ -38,7 +38,7 @@ class CanvasSearchHighlight final : public Component
         auto const oB = targetObj->getBounds().reduced(Object::margin);
 
         NVGcolor oCol;
-        NVGcolor iCol = oCol = parentCnv->selectedOutlineCol;
+        NVGcolor iCol = oCol = nvgColour(PlugDataColours::objectSelectedOutlineColour);
         iCol.a = opacity > 1.0f ? 150 : 150 * opacity;
         oCol.a = opacity > 1.0f ? 255 : 255 * opacity;
         nvgDrawRoundedRect(nvg, oB.getX(), oB.getY(), oB.getWidth(), oB.getHeight(), iCol, oCol, Corners::objectCornerRadius);

Source/Components/CanvasSearchHighlight.h

@@ -56,7 +56,7 @@ class GraphArea final : public Component
     {
         auto lineBounds = getLocalBounds().toFloat().reduced(4.0f);
 
-        nvgDrawRoundedRect(nvg, lineBounds.getX(), lineBounds.getY(), lineBounds.getWidth(), lineBounds.getHeight(), nvgRGBA(0, 0, 0, 0), canvas->graphAreaCol, Corners::objectCornerRadius);
+        nvgDrawRoundedRect(nvg, lineBounds.getX(), lineBounds.getY(), lineBounds.getWidth(), lineBounds.getHeight(), nvgRGBA(0, 0, 0, 0), nvgColour(PlugDataColours::graphAreaColour), Corners::objectCornerRadius);
 
         if (!getValue<bool>(canvas->locked)) {
             auto& resizeHandleImage = canvas->resizeHandleImage;
@@ -86,7 +86,7 @@ class GraphArea final : public Component
 
                 nvgBeginPath(nvg);
                 nvgRect(nvg, 0, 0, 9, 9);
-                nvgFillPaint(nvg, nvgImageAlphaPattern(nvg, 0, 0, 9, 9, 0, resizeHandleImage.getImageId(), canvas->graphAreaCol));
+                nvgFillPaint(nvg, nvgImageAlphaPattern(nvg, 0, 0, 9, 9, 0, resizeHandleImage.getImageId(), nvgColour(PlugDataColours::graphAreaColour)));
                 nvgFill(nvg);
                 angle -= 90;
             }

Source/Components/GraphArea.h

@@ -127,7 +127,7 @@ void Connection::changeListenerCallback(ChangeBroadcaster* source)
 
 void Connection::lookAndFeelChanged()
 {
-    handleColour = outlet->isSignal ? cnv->dataCol : cnv->sigCol;
+    handleColour = outlet->isSignal ? nvgColour(PlugDataColours::dataColour) : nvgColour(PlugDataColours::signalColour);
     shadowColour = nvgColour(PlugDataColours::canvasBackgroundColour.contrasting(0.06f).withAlpha(0.24f));
     outlineColour = nvgColour(PlugDataColours::objectOutlineColour);
 
@@ -144,17 +144,19 @@ void Connection::lookAndFeelChanged()
 
 NVGcolor Connection::getConnectionColour() const
 {
+    Colour c = PlugDataColours::connectionColour;
     if (isSelected() || isHovering) {
         if (outlet->isSignal) {
-            return isHovering ? cnv->sigColBrighter : cnv->sigCol;
+            c = PlugDataColours::signalColour;
         }
-        if (outlet->isGemState) {
-            return isHovering ? cnv->gemColBrigher : cnv->gemCol;
+        else if (outlet->isGemState) {
+            c = PlugDataColours::gemColour;
+        }
+        else {
+            c = PlugDataColours::dataColour;
         }
-
-        return isHovering ? cnv->dataColBrighter : cnv->dataCol;
     }
-    return cnv->baseCol;
+    return nvgColour(isHovering ? c.brighter() : c);
 }
 
 void Connection::render(NVGcontext* nvg)

Source/Connection.cpp

@@ -76,14 +76,14 @@ void Iolet::render(NVGcontext* nvg)
     bool const isLocked = locked || commandLocked;
     bool const isHovering = isTargeted && !isLocked;
 
-    auto const innerCol = isLocked ? cnv->ioletLockedCol : isSignal ? cnv->sigCol
-        : isGemState                                                ? cnv->gemCol
-                                                                    : cnv->dataCol;
+    auto const innerCol = isLocked ? nvgColour(PlugDataColours::canvasBackgroundColour.contrasting(0.5f)) : isSignal ? nvgColour(PlugDataColours::signalColour)
+        : isGemState                                                ? nvgColour(PlugDataColours::gemColour)
+                                                                    : nvgColour(PlugDataColours::dataColour);
     auto iB = PlugDataLook::useSquareIolets ? getLocalBounds().toFloat().reduced(2.0f, 3.33f) : getLocalBounds().toFloat().reduced(2.0f);
     if (isHovering)
         iB.expand(1.0f, 1.0f);
 
-    nvgDrawRoundedRect(nvg, iB.getX(), iB.getY(), iB.getWidth(), iB.getHeight(), innerCol, cnv->objectOutlineCol, PlugDataLook::useSquareIolets ? 0.0f : iB.getWidth() * 0.5f);
+    nvgDrawRoundedRect(nvg, iB.getX(), iB.getY(), iB.getWidth(), iB.getHeight(), innerCol, nvgColour(PlugDataColours::objectOutlineColour), PlugDataLook::useSquareIolets ? 0.0f : iB.getWidth() * 0.5f);
 }
 
 bool Iolet::hitTest(int const x, int const y)

Source/Iolet.cpp

@@ -58,7 +58,7 @@ struct PlugDataColours {
 
 static inline NVGcolor nvgColour(Colour const& c)
 {
-    return nvgRGBA(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha());
+    return std::bit_cast<NVGcolor>(c); // Both store as BGRA internally
 }
 
 inline UnorderedMap<PlugDataColour, std::tuple<String, String, String>> const PlugDataColourNames = {

Source/LookAndFeel.h

@@ -1193,7 +1193,7 @@ void Object::render(NVGcontext* nvg)
     auto const b = lb.reduced(margin);
 
     if (cnv->shouldShowObjectActivity() && !approximatelyEqual(activeStateAlpha, 0.0f)) {
-        auto glowColour = cnv->dataCol;
+        auto glowColour = nvgColour(PlugDataColours::dataColour);
         glowColour.a = static_cast<uint8_t>(activeStateAlpha * 255);
         nvgSmoothGlow(nvg, lb.getX(), lb.getY(), lb.getWidth(), lb.getHeight(), glowColour, nvgRGBA(0, 0, 0, 0), Corners::objectCornerRadius, 1.1f);
     }
@@ -1210,14 +1210,14 @@ void Object::render(NVGcontext* nvg)
 
             nvgBeginPath(nvg);
             nvgRect(nvg, 0, 0, 9, 9);
-            nvgFillPaint(nvg, nvgImageAlphaPattern(nvg, 0, 0, 9, 9, 0, resizeHandleImage.getImageId(), cnv->selectedOutlineCol));
+            nvgFillPaint(nvg, nvgImageAlphaPattern(nvg, 0, 0, 9, 9, 0, resizeHandleImage.getImageId(), nvgColour(PlugDataColours::objectSelectedOutlineColour)));
             nvgFill(nvg);
             angle -= 90;
         }
     }
 
     if (gui && gui->isTransparent() && !getValue<bool>(locked) && !cnv->isGraph) {
-        nvgFillColor(nvg, cnv->transparentObjectBackgroundCol);
+        nvgFillColor(nvg, nvgColour(PlugDataColours::canvasBackgroundColour.contrasting(0.35f).withAlpha(0.1f)));
         nvgFillRoundedRect(nvg, b.getX(), b.getY(), b.getWidth(), b.getHeight(), Corners::objectCornerRadius);
     }
 
@@ -1228,7 +1228,7 @@ void Object::render(NVGcontext* nvg)
     }
 
     if (newObjectEditor) {
-        nvgDrawRoundedRect(nvg, 0, 0, b.getWidth(), b.getHeight(), cnv->textObjectBackgroundCol, isSelected() ? cnv->selectedOutlineCol : cnv->objectOutlineCol, Corners::objectCornerRadius);
+        nvgDrawRoundedRect(nvg, 0, 0, b.getWidth(), b.getHeight(), nvgColour(PlugDataColours::textObjectBackgroundColour), nvgColour(isSelected() ? PlugDataColours::objectSelectedOutlineColour : PlugDataColours::objectOutlineColour), Corners::objectCornerRadius);
         Graphics g(*editor->getNanoLLGC());
         newObjectEditor->paintEntireComponent(g, true);
     }
@@ -1244,10 +1244,10 @@ void Object::render(NVGcontext* nvg)
             nvgEllipse(nvg, fakeInletBounds[0] + fakeInletBounds[2] * 0.5f, fakeInletBounds[1] + fakeInletBounds[3] * 0.5f, fakeInletBounds[2] * 0.5f, fakeInletBounds[3] * 0.5f);
         }
 
-        nvgFillColor(nvg, outlet->isSignal ? cnv->sigColBrighter : cnv->dataColBrighter);
+        nvgFillColor(nvg, nvgColour(outlet->isSignal ? PlugDataColours::signalColour.brighter() : PlugDataColours::dataColour.brighter()));
         nvgFill(nvg);
 
-        nvgStrokeColor(nvg, cnv->objectOutlineCol);
+        nvgStrokeColor(nvg, nvgColour(PlugDataColours::objectOutlineColour));
         nvgStrokeWidth(nvg, 1.0f);
         nvgStroke(nvg);
     }
@@ -1268,13 +1268,13 @@ void Object::render(NVGcontext* nvg)
         int const textWidth = 6 + text.length() * 4;
         auto const indexBounds = b.withSizeKeepingCentre(b.getWidth() + doubleMargin, halfHeight * 2).removeFromRight(textWidth);
 
-        auto const fillColour = cnv->selectedOutlineCol;
+        auto const fillColour = nvgColour(PlugDataColours::objectSelectedOutlineColour);
         nvgDrawRoundedRect(nvg, indexBounds.getX(), indexBounds.getY(), indexBounds.getWidth(), indexBounds.getHeight(), fillColour, fillColour, 2.0f);
 
         nvgFontSize(nvg, 8.0f);
         nvgFontFace(nvg, "Inter-Regular");
         nvgTextAlign(nvg, NVG_ALIGN_MIDDLE | NVG_ALIGN_CENTER);
-        nvgFillColor(nvg, cnv->indexTextCol);
+        nvgFillColor(nvg, nvgColour(PlugDataColours::objectSelectedOutlineColour.contrasting()));
         nvgText(nvg, indexBounds.getCentreX(), indexBounds.getCentreY(), text.c_str(), nullptr);
     }
 

Source/Object.cpp

@@ -1262,7 +1262,7 @@ class ArrayObject final : public ObjectBase {
             graph->render(nvg);
         }
 
-        nvgStrokeColor(nvg, cnv->guiObjectInternalOutlineCol);
+        nvgStrokeColor(nvg, nvgColour(PlugDataColours::guiObjectInternalOutlineColour));
         ticks.render(nvg, b);
     }