Clean up, fix rounded corners on Linux

Author: timothyschoen

Libraries/nanovg

@@ -472,7 +472,7 @@ void Canvas::updateFramebuffers(NVGcontext* nvg)
     if (dotsLargeImage.needsUpdate(gridBufferSize, gridBufferSize) || lastObjectGridSize != gridLogicalSize) {
         lastObjectGridSize = gridLogicalSize;
 
-        dotsLargeImage = NVGImage(nvg, gridBufferSize, gridBufferSize, [this, zoom, viewScale, gridLogicalSize, gridSizeCommon](Graphics& g) {
+        dotsLargeImage = NVGImage(nvg, gridBufferSize, gridBufferSize, [zoom, viewScale, gridLogicalSize, gridSizeCommon](Graphics& g) {
             g.addTransform(AffineTransform::scale(viewScale, viewScale));
             float const ellipseRadius = zoom < 1.0f ? jmap(zoom, 0.25f, 1.0f, 3.0f, 1.0f) : 1.0f;
 

Source/Canvas.cpp

@@ -14,6 +14,9 @@ using namespace juce::gl;
 #ifdef NANOVG_GL_IMPLEMENTATION
 #    include <nanovg_gl.h>
 #    include <nanovg_gl_utils.h>
+#if JUCE_LINUX || JUCE_BSD
+void nvgluSetCornerRadius(float radius, bool left, bool right);
+#endif
 #endif
 
 #include "NVGSurface.h"
@@ -155,6 +158,10 @@ void NVGSurface::initialise()
         return;
     }
 
+#if JUCE_LINUX || JUCE_BSD
+    nvgluSetCornerRadius(12.0f * lastRenderScale, roundedRight, roundedRight);
+#endif
+
     surfaces[nvg] = this;
 
     nvgAtlasTextThreshold(nvg, 32.0f);
@@ -456,6 +463,15 @@ void NVGSurface::blitToScreen()
 #endif
 }
 
+#if JUCE_LINUX || JUCE_BSD
+void NVGSurface::setRoundedBottomCorners(bool left, bool right)
+{
+    roundedLeft = left;
+    roundedRight = right;
+    nvgluSetCornerRadius(12.0f * lastRenderScale, roundedLeft, roundedRight);
+}
+#endif
+
 void NVGSurface::renderFrameToImage(Image& image, Rectangle<int> const area)
 {
     nvgBindFramebuffer(nullptr);

Source/NVGSurface.cpp

@@ -106,6 +106,11 @@ class NVGSurface final :
 
     void resized() override;
 
+#if JUCE_LINUX || JUCE_BSD
+    bool roundedLeft = false, roundedRight = true;
+    void setRoundedBottomCorners(bool left, bool right);
+#endif
+
     void addBufferedObject(NVGComponent* component);
     void removeBufferedObject(NVGComponent* component);
 

Source/NVGSurface.h

@@ -374,7 +374,7 @@ void PluginEditor::paint(Graphics& g)
         baseColour = baseColour.brighter(baseColour.getBrightness() / 2.5f);
     }
 
-#if JUCE_MAC || JUCE_LINUX
+#if JUCE_MAC || JUCE_LINUX || JUCE_BSD
     if (wantsRoundedCorners()) {
         g.setColour(baseColour);
         g.fillRoundedRectangle(getLocalBounds().toFloat(), Corners::windowCornerRadius);
@@ -552,6 +552,10 @@ void PluginEditor::resized()
         return;
     }
 
+#if JUCE_LINUX || JUCE_BSD
+    nvgSurface.setRoundedBottomCorners(true, sidebar->isHidden());
+#endif
+
     auto const workAreaHeight = getHeight() - toolbarHeight;
     auto const sidebarWidth = (sidebar->isVisible() && !sidebar->isHidden()) ? sidebar->getWidth() : 0;
     workArea = Rectangle<int>(0, toolbarHeight, getWidth() - sidebarWidth, workAreaHeight);
@@ -587,8 +591,6 @@ void PluginEditor::resized()
     redoButton.setBounds(2 * buttonDistance + offset, 0, buttonSize, buttonSize);
     addObjectMenuButton.setBounds(3 * buttonDistance + offset, 0, buttonSize, buttonSize);
 
-    auto const startX = getWidth() / 2.0f - toolbarHeight * 1.5;
-
     if (touchSelectionHelper) {
         auto touchHelperBounds = getLocalBounds().removeFromBottom(48).withSizeKeepingCentre(192, 48).translated(0, -54);
         if (touchSelectionHelper)

Source/PluginEditor.cpp

@@ -1323,7 +1323,7 @@ void AudioToolbar::setLatencyDisplay(int samples)
 {
     if (!ProjectInfo::isStandalone) {
         dawLatencyBadge->setVisible(samples);
-        dawLatencyBadge->setText(String("Latency: " + samples));
+        dawLatencyBadge->setText("Latency: " + String(samples));
     }
 }