brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small correction to meters

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-02-05 21:09:29 +00:00
parent 5b6a3c245d
commit ca3ea265f0
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
2 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/Cardinal/src/Ildaeil.cpp
View file

@ -1553,7 +1553,10 @@ struct IldaeilNanoMeterIn : NanoMeter {
IldaeilModule* const module; IldaeilModule* const module;
IldaeilNanoMeterIn(IldaeilModule* const m) IldaeilNanoMeterIn(IldaeilModule* const m)
: module(m) {} : module(m)
{
withBackground = false;
}
void updateMeters() override void updateMeters() override
{ {
@ -1571,7 +1574,10 @@ struct IldaeilNanoMeterOut : NanoMeter {
IldaeilModule* const module; IldaeilModule* const module;
IldaeilNanoMeterOut(IldaeilModule* const m) IldaeilNanoMeterOut(IldaeilModule* const m)
: module(m) {} : module(m)
{
withBackground = false;
}
void updateMeters() override void updateMeters() override
{ {
@ -1613,12 +1619,12 @@ struct IldaeilModuleWidget : ModuleWidgetWithSideScrews<26> {
IldaeilNanoMeterIn* const meterIn = new IldaeilNanoMeterIn(module); IldaeilNanoMeterIn* const meterIn = new IldaeilNanoMeterIn(module);
meterIn->box.pos = Vec(2.0f, startY + padding * 2); meterIn->box.pos = Vec(2.0f, startY + padding * 2);
meterIn->box.size = Vec(RACK_GRID_WIDTH * 3 - 2.0f, box.size.y - meterIn->box.pos.y - 20.0f); meterIn->box.size = Vec(RACK_GRID_WIDTH * 3 - 2.0f, box.size.y - meterIn->box.pos.y - 19.0f);
addChild(meterIn); addChild(meterIn);
IldaeilNanoMeterOut* const meterOut = new IldaeilNanoMeterOut(module); IldaeilNanoMeterOut* const meterOut = new IldaeilNanoMeterOut(module);
meterOut->box.pos = Vec(box.size.x - RACK_GRID_WIDTH * 3 + 1.0f, startY + padding * 2); meterOut->box.pos = Vec(box.size.x - RACK_GRID_WIDTH * 3 + 1.0f, startY + padding * 2);
meterOut->box.size = Vec(RACK_GRID_WIDTH * 3 - 2.0f, box.size.y - meterOut->box.pos.y - 20.0f); meterOut->box.size = Vec(RACK_GRID_WIDTH * 3 - 2.0f, box.size.y - meterOut->box.pos.y - 19.0f);
addChild(meterOut); addChild(meterOut);
} }

21
plugins/Cardinal/src/Widgets.hpp
View file

@ -243,6 +243,7 @@ struct NanoKnob : Knob {
struct NanoMeter : Widget { struct NanoMeter : Widget {
bool hasGainKnob = false; bool hasGainKnob = false;
bool withBackground = true;
float gainMeterL = 0.0f; float gainMeterL = 0.0f;
float gainMeterR = 0.0f; float gainMeterR = 0.0f;
@ -255,15 +256,17 @@ struct NanoMeter : Widget {
const float usableHeight = box.size.y - (hasGainKnob ? 10.0f : 0.0f); const float usableHeight = box.size.y - (hasGainKnob ? 10.0f : 0.0f);
// draw background if (withBackground)
nvgBeginPath(args.vg); {
nvgRect(args.vg, nvgBeginPath(args.vg);
0, nvgRect(args.vg,
0, 0,
box.size.x, 0,
usableHeight); box.size.x,
nvgFillColor(args.vg, nvgRGB(26, 26, 26)); usableHeight);
nvgFill(args.vg); nvgFillColor(args.vg, nvgRGB(26, 26, 26));
nvgFill(args.vg);
}
nvgFillColor(args.vg, nvgRGBAf(0.76f, 0.11f, 0.22f, 0.5f)); nvgFillColor(args.vg, nvgRGBAf(0.76f, 0.11f, 0.22f, 0.5f));
nvgStrokeColor(args.vg, nvgRGBf(0.76f, 0.11f, 0.22f)); nvgStrokeColor(args.vg, nvgRGBf(0.76f, 0.11f, 0.22f));