From a1a69b99dab1dde527a5ffe8024ae7d6f7e67384 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Wed, 22 Feb 2017 23:07:12 -0500 Subject: [PATCH] Updated Braids display to match Component Library style, removed Branches mode buttons (for now) --- src/Braids.cpp | 25 +++++++++++++++++++------ src/Branches.cpp | 4 ++-- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/Braids.cpp b/src/Braids.cpp index 2806df9..e4c95af 100644 --- a/src/Braids.cpp +++ b/src/Braids.cpp @@ -167,15 +167,27 @@ struct BraidsDisplay : TransparentWidget { void draw(NVGcontext *vg) { int shape = roundf(getf(value)); + // Background + NVGcolor backgroundColor = nvgRGB(0x38, 0x38, 0x38); + NVGcolor borderColor = nvgRGB(0x10, 0x10, 0x10); + nvgBeginPath(vg); + nvgRoundedRect(vg, 0.0, 0.0, box.size.x, box.size.y, 5.0); + nvgFillColor(vg, backgroundColor); + nvgFill(vg); + nvgStrokeWidth(vg, 1.0); + nvgStrokeColor(vg, borderColor); + nvgStroke(vg); + nvgFontSize(vg, 36); nvgFontFaceId(vg, font->handle); nvgTextLetterSpacing(vg, 2.5); - NVGcolor color = nvgRGB(0xaf, 0xd2, 0x2c); - nvgFillColor(vg, nvgTransRGBA(color, 16)); - nvgText(vg, 0.0, 0.0, "~~~~", NULL); - nvgFillColor(vg, color); - nvgText(vg, 0.0, 0.0, algo_values[shape], NULL); + Vec textPos = Vec(10, 48); + NVGcolor textColor = nvgRGB(0xaf, 0xd2, 0x2c); + nvgFillColor(vg, nvgTransRGBA(textColor, 16)); + nvgText(vg, textPos.x, textPos.y, "~~~~", NULL); + nvgFillColor(vg, textColor); + nvgText(vg, textPos.x, textPos.y, algo_values[shape], NULL); } }; @@ -194,7 +206,8 @@ BraidsWidget::BraidsWidget() { { BraidsDisplay *display = new BraidsDisplay(); - display->box.pos = Vec(24, 101); + display->box.pos = Vec(14, 53); + display->box.size = Vec(148, 56); display->value = &module->params[Braids::SHAPE_PARAM]; addChild(display); } diff --git a/src/Branches.cpp b/src/Branches.cpp index 237c69b..907acec 100644 --- a/src/Branches.cpp +++ b/src/Branches.cpp @@ -89,14 +89,14 @@ BranchesWidget::BranchesWidget() { addChild(createScrew(Vec(15, 365))); addParam(createParam(Vec(24, 64), module, Branches::THRESHOLD1_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(69, 58), module, Branches::MODE1_PARAM, 0.0, 1.0, 0.0)); + // addParam(createParam(Vec(69, 58), module, Branches::MODE1_PARAM, 0.0, 1.0, 0.0)); addInput(createInput(Vec(5, 119), module, Branches::IN1_INPUT)); addInput(createInput(Vec(52, 119), module, Branches::P1_INPUT)); addOutput(createOutput(Vec(5, 157), module, Branches::OUT1A_OUTPUT)); addOutput(createOutput(Vec(52, 157), module, Branches::OUT1B_OUTPUT)); addParam(createParam(Vec(24, 220), module, Branches::THRESHOLD2_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(69, 214), module, Branches::MODE2_PARAM, 0.0, 1.0, 0.0)); + // addParam(createParam(Vec(69, 214), module, Branches::MODE2_PARAM, 0.0, 1.0, 0.0)); addInput(createInput(Vec(5, 275), module, Branches::IN2_INPUT)); addInput(createInput(Vec(52, 275), module, Branches::P2_INPUT)); addOutput(createOutput(Vec(5, 313), module, Branches::OUT2A_OUTPUT));