From 4fec80171dc7d4cee9704e486b0a871925d6703d Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 20 Nov 2019 10:36:38 -0500 Subject: [PATCH] Draw the LFO after the envelope (#1320) The LFO oscillator was drawn before the envelope leading to a misdraw which was visible at high zoom. Just change the order of path draws. Closes #1293 --- src/common/gui/CLFOGui.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/common/gui/CLFOGui.cpp b/src/common/gui/CLFOGui.cpp index 6decda57f9b..ba7671e28c5 100644 --- a/src/common/gui/CLFOGui.cpp +++ b/src/common/gui/CLFOGui.cpp @@ -384,14 +384,7 @@ void CLFOGui::drawVectorized(CDrawContext* dc) dc->setFrameColor(VSTGUI::CColor(0xE0, 0x80, 0x00)); dc->drawLine(top0, top1); dc->drawLine(bot0, bot1); - -#if LINUX - dc->setLineWidth(100.0); -#else - dc->setLineWidth(1.3); -#endif - dc->setFrameColor(VSTGUI::CColor(0x00, 0x00, 0, 0xFF)); - dc->drawGraphicsPath(path, VSTGUI::CDrawContext::PathDrawMode::kPathStroked, &tfpath ); + #if LINUX dc->setLineWidth(100.0); @@ -401,6 +394,17 @@ void CLFOGui::drawVectorized(CDrawContext* dc) dc->setFrameColor(VSTGUI::CColor(0xB0, 0x60, 0x00, 0xFF)); dc->drawGraphicsPath(eupath, VSTGUI::CDrawContext::PathDrawMode::kPathStroked, &tfpath ); dc->drawGraphicsPath(edpath, VSTGUI::CDrawContext::PathDrawMode::kPathStroked, &tfpath ); + +#if LINUX + dc->setLineWidth(100.0); +#else + dc->setLineWidth(1.3); +#endif + dc->setFrameColor(VSTGUI::CColor(0x00, 0x00, 0, 0xFF)); + dc->drawGraphicsPath(path, VSTGUI::CDrawContext::PathDrawMode::kPathStroked, &tfpath ); + + + dc->restoreGlobalState(); path->forget(); eupath->forget();