commit 946832770906c8e0c3185dbcff936066a8d622ed
parent fdf84b0d27d706b2b2bd6b3a01a797ea3e2fe284
Author: Matt Demanett <matt@demanett.net>
Date: Sun, 9 Aug 2020 00:18:12 -0400
On context menus, add space above "Panel", not below.
Diffstat:
30 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/src/AD.cpp b/src/AD.cpp
@@ -171,7 +171,6 @@ struct ADWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<AD*>(module);
assert(m);
- menu->addChild(new MenuLabel());
menu->addChild(new OptionMenuItem(
"Invert output",
[m]() { return m->_invert == -1.0f; },
diff --git a/src/ADSR.cpp b/src/ADSR.cpp
@@ -139,7 +139,6 @@ struct ADSRWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<ADSR*>(module);
assert(m);
- menu->addChild(new MenuLabel());
menu->addChild(new OptionMenuItem(
"Invert output",
[m]() { return m->_invert == -1.0f; },
diff --git a/src/AMRM.cpp b/src/AMRM.cpp
@@ -88,7 +88,6 @@ struct AMRMWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<AMRM*>(module);
assert(m);
- menu->addChild(new MenuLabel());
OptionsMenuItem* p = new OptionsMenuItem("Polyphony channels from");
p->addItem(OptionMenuItem("CAR input", [m]() { return m->_polyInputID == AMRM::CARRIER_INPUT; }, [m]() { m->_polyInputID = AMRM::CARRIER_INPUT; }));
p->addItem(OptionMenuItem("MOD input", [m]() { return m->_polyInputID == AMRM::MODULATOR_INPUT; }, [m]() { m->_polyInputID = AMRM::MODULATOR_INPUT; }));
diff --git a/src/Analyzer.cpp b/src/Analyzer.cpp
@@ -146,7 +146,6 @@ struct AnalyzerWidget : BGModuleWidget {
auto a = dynamic_cast<Analyzer*>(module);
assert(a);
- menu->addChild(new MenuLabel());
OptionsMenuItem* mi = new OptionsMenuItem("Amplitude range");
mi->addItem(OptionMenuItem("To -60dB", [a]() { return a->_rangeDb == 80.0f; }, [a]() { a->_rangeDb = 80.0f; }));
mi->addItem(OptionMenuItem("To -120dB", [a]() { return a->_rangeDb == 140.0f; }, [a]() { a->_rangeDb = 140.0f; }));
diff --git a/src/Arp.cpp b/src/Arp.cpp
@@ -406,7 +406,6 @@ struct ArpWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<Arp*>(module);
assert(m);
- menu->addChild(new MenuLabel());
OptionsMenuItem* ni = new OptionsMenuItem("Use new notes");
ni->addItem(OptionMenuItem("On arpeggio restart", [m]() { return !m->_notesImmediate; }, [m]() { m->_notesImmediate = false; }));
diff --git a/src/FMOp.cpp b/src/FMOp.cpp
@@ -330,7 +330,6 @@ struct FMOpWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto fmop = dynamic_cast<FMOp*>(module);
assert(fmop);
- menu->addChild(new MenuLabel());
menu->addChild(new BoolOptionMenuItem("Linear level response", [fmop]() { return &fmop->_linearLevel; }));
}
};
diff --git a/src/Inv.cpp b/src/Inv.cpp
@@ -147,7 +147,6 @@ struct InvWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<Inv*>(module);
assert(m);
- menu->addChild(new MenuLabel());
menu->addChild(new BoolOptionMenuItem("Save latched state to patch", [m]() { return &m->_saveLatchedToPatch; }));
}
};
diff --git a/src/LVCF.cpp b/src/LVCF.cpp
@@ -195,7 +195,6 @@ struct LVCFWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<LVCF*>(module);
assert(m);
- menu->addChild(new MenuLabel());
OptionsMenuItem* s = new OptionsMenuItem("Slope");
s->addItem(OptionMenuItem("1 pole", [m]() { return m->_polesSetting == 1; }, [m]() { m->_polesSetting = 1; }));
diff --git a/src/LVCO.cpp b/src/LVCO.cpp
@@ -133,7 +133,6 @@ struct LVCOWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<LVCO*>(module);
assert(m);
- menu->addChild(new MenuLabel());
OptionsMenuItem* fm = new OptionsMenuItem("FM mode");
fm->addItem(OptionMenuItem("Exponential", [m]() { return !m->_fmLinearMode; }, [m]() { m->_fmLinearMode = false; }));
diff --git a/src/Mute8.cpp b/src/Mute8.cpp
@@ -192,7 +192,6 @@ struct Mute8Widget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<Mute8*>(module);
assert(m);
- menu->addChild(new MenuLabel());
menu->addChild(new BoolOptionMenuItem("Latching CV triggers", [m]() { return &m->_latchingCVs; }));
}
};
diff --git a/src/Noise.cpp b/src/Noise.cpp
@@ -69,7 +69,6 @@ struct NoiseWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<Noise*>(module);
assert(m);
- menu->addChild(new MenuLabel());
menu->addChild(new PolyChannelsMenuItem(m));
}
};
diff --git a/src/PolyCon16.cpp b/src/PolyCon16.cpp
@@ -115,7 +115,6 @@ struct PolyCon16Widget : BGModuleWidget {
}
void contextMenu(Menu* menu) override {
- menu->addChild(new MenuLabel());
OutputRangeOptionMenuItem::addOutputRangeOptionsToMenu(module, menu);
}
};
diff --git a/src/PolyCon8.cpp b/src/PolyCon8.cpp
@@ -72,7 +72,6 @@ struct PolyCon8Widget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<PolyCon8*>(module);
assert(m);
- menu->addChild(new MenuLabel());
menu->addChild(new PolyChannelsMenuItem(m, 8));
OutputRangeOptionMenuItem::addOutputRangeOptionsToMenu(module, menu);
}
diff --git a/src/PolyOff16.cpp b/src/PolyOff16.cpp
@@ -197,7 +197,6 @@ struct PolyOff16Widget : BGModuleWidget {
}
void contextMenu(Menu* menu) override {
- menu->addChild(new MenuLabel());
OutputRangeOptionMenuItem::addOutputRangeOptionsToMenu(module, menu);
}
};
diff --git a/src/PolyOff8.cpp b/src/PolyOff8.cpp
@@ -133,7 +133,6 @@ struct PolyOff8Widget : BGModuleWidget {
}
void contextMenu(Menu* menu) override {
- menu->addChild(new MenuLabel());
OutputRangeOptionMenuItem::addOutputRangeOptionsToMenu(module, menu);
}
};
diff --git a/src/Pulse.cpp b/src/Pulse.cpp
@@ -90,7 +90,6 @@ struct PulseWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<Pulse*>(module);
assert(m);
- menu->addChild(new MenuLabel());
menu->addChild(new BoolOptionMenuItem("Linear frequency mode", [m]() { return &m->_linearMode; }));
}
};
diff --git a/src/SampleHold.cpp b/src/SampleHold.cpp
@@ -184,7 +184,6 @@ struct SampleHoldWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<SampleHold*>(module);
assert(m);
- menu->addChild(new MenuLabel());
{
OptionsMenuItem* p = new OptionsMenuItem("Polyphony channels from");
p->addItem(OptionMenuItem("GATE input", [m]() { return m->_polyInputID == SampleHold::TRIGGER1_INPUT; }, [m]() { m->_polyInputID = SampleHold::TRIGGER1_INPUT; }));
diff --git a/src/Sine.cpp b/src/Sine.cpp
@@ -137,7 +137,6 @@ struct SineWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<Sine*>(module);
assert(m);
- menu->addChild(new MenuLabel());
OptionsMenuItem* w = new OptionsMenuItem("Waveform");
w->addItem(OptionMenuItem("Sine", [m]() { return m->_wave == Sine::SINE_WAVE; }, [m]() { m->_wave = Sine::SINE_WAVE; }));
diff --git a/src/Switch.cpp b/src/Switch.cpp
@@ -167,7 +167,6 @@ struct SwitchWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<bogaudio::Switch*>(module);
assert(m);
- menu->addChild(new MenuLabel());
menu->addChild(new BoolOptionMenuItem("Save latched state to patch", [m]() { return &m->_saveLatchedToPatch; }));
}
};
diff --git a/src/VCF.cpp b/src/VCF.cpp
@@ -239,7 +239,6 @@ struct VCFWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<VCF*>(module);
assert(m);
- menu->addChild(new MenuLabel());
OptionsMenuItem* bwm = new OptionsMenuItem("Bandwidth mode");
bwm->addItem(OptionMenuItem("Pitched", [m]() { return m->_bandwidthMode == MultimodeFilter::PITCH_BANDWIDTH_MODE; }, [m]() { m->_bandwidthMode = MultimodeFilter::PITCH_BANDWIDTH_MODE; }));
bwm->addItem(OptionMenuItem("Linear", [m]() { return m->_bandwidthMode == MultimodeFilter::LINEAR_BANDWIDTH_MODE; }, [m]() { m->_bandwidthMode = MultimodeFilter::LINEAR_BANDWIDTH_MODE; }));
diff --git a/src/VCO.cpp b/src/VCO.cpp
@@ -103,7 +103,6 @@ struct VCOWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<VCO*>(module);
assert(m);
- menu->addChild(new MenuLabel());
OptionsMenuItem* p = new OptionsMenuItem("Polyphony channels from");
p->addItem(OptionMenuItem("V/OCT input", [m]() { return m->_polyInputID == VCO::PITCH_INPUT; }, [m]() { m->_polyInputID = VCO::PITCH_INPUT; }));
p->addItem(OptionMenuItem("FM input", [m]() { return m->_polyInputID == VCO::FM_INPUT; }, [m]() { m->_polyInputID = VCO::FM_INPUT; }));
diff --git a/src/Walk.cpp b/src/Walk.cpp
@@ -162,7 +162,6 @@ struct WalkWidget : BGModuleWidget {
void contextMenu(Menu* menu) override {
auto m = dynamic_cast<Walk*>(module);
assert(m);
- menu->addChild(new MenuLabel());
OptionsMenuItem* p = new OptionsMenuItem("Polyphony channels from");
p->addItem(OptionMenuItem("RATE input", [m]() { return m->_polyInputID == Walk::RATE_INPUT; }, [m]() { m->_polyInputID = Walk::RATE_INPUT; }));
diff --git a/src/Walk2.cpp b/src/Walk2.cpp
@@ -553,7 +553,6 @@ struct Walk2Widget : BGModuleWidget {
auto m = dynamic_cast<Walk2*>(module);
assert(m);
- menu->addChild(new MenuLabel());
{
OptionsMenuItem* mi = new OptionsMenuItem("Display range");
mi->addItem(OptionMenuItem("+/-5V", [m]() { return m->_zoomOut == false; }, [m]() { m->_zoomOut = false; }));
diff --git a/src/addressable_sequence.cpp b/src/addressable_sequence.cpp
@@ -125,7 +125,6 @@ void AddressableSequenceBaseModuleWidget::contextMenu(Menu* menu) {
auto m = dynamic_cast<AddressableSequenceModule*>(module);
assert(m);
- menu->addChild(new MenuLabel());
OptionsMenuItem* p = new OptionsMenuItem("Polyphony channels from");
p->addItem(OptionMenuItem("CLOCK input", [m]() { return m->_polyInputID == m->_clockInputID; }, [m]() { m->_polyInputID = m->_clockInputID; }));
p->addItem(OptionMenuItem("SELECT input", [m]() { return m->_polyInputID == m->_selectInputID; }, [m]() { m->_polyInputID = m->_selectInputID; }));
diff --git a/src/disable_output_limit.cpp b/src/disable_output_limit.cpp
@@ -19,6 +19,5 @@ void DisableOutputLimitModule::fromJson(json_t* root) {
void DisableOutputLimitModuleWidget::contextMenu(Menu* menu) {
auto m = dynamic_cast<DisableOutputLimitModule*>(module);
assert(m);
- menu->addChild(new MenuLabel());
menu->addChild(new BoolOptionMenuItem("Disable output limit", [m]() { return &m->_disableOutputLimit; }));
}
diff --git a/src/matrix_base.cpp b/src/matrix_base.cpp
@@ -37,7 +37,6 @@ void MatrixBaseModule::modulate() {
void MatrixBaseModuleWidget::contextMenu(Menu* menu) {
auto m = dynamic_cast<MatrixBaseModule*>(module);
assert(m);
- menu->addChild(new MenuLabel());
OptionsMenuItem* g = new OptionsMenuItem("Input gain");
g->addItem(OptionMenuItem("Unity", [m]() { return (int)m->_inputGainDb == 0; }, [m]() { m->_inputGainDb = 0.0f; }));
diff --git a/src/mixer.cpp b/src/mixer.cpp
@@ -56,7 +56,6 @@ void DimmableMixerModule::fromJson(json_t* root) {
void DimmableMixerWidget::contextMenu(Menu* menu) {
auto m = dynamic_cast<DimmableMixerModule*>(module);
assert(m);
- menu->addChild(new MenuLabel());
OptionsMenuItem* da = new OptionsMenuItem("Dim amount");
da->addItem(OptionMenuItem("-6 dB", [m]() { return m->_dimDb == 6.0f; }, [m]() { m->_dimDb = 6.0f; }));
da->addItem(OptionMenuItem("-12 dB", [m]() { return m->_dimDb == 12.0f; }, [m]() { m->_dimDb = 12.0f; }));
diff --git a/src/module.cpp b/src/module.cpp
@@ -150,7 +150,7 @@ void BGModuleWidget::appendContextMenu(Menu* menu) {
if (m->_skinnable) {
Skins* skins = &Skins::skins();
if (skins->available().size() > 0) {
- // menu->addChild(new MenuLabel());
+ menu->addChild(new MenuLabel());
OptionsMenuItem* s = new OptionsMenuItem("Panel");
s->addItem(OptionMenuItem("Default", [m]() { return m->_skin == "default"; }, [m]() { m->setSkin("default"); }));
diff --git a/src/parametric_eq.cpp b/src/parametric_eq.cpp
@@ -146,6 +146,5 @@ void BandExcludeModule::fromJson(json_t* root) {
void BandExcludeModuleWidget::contextMenu(Menu* menu) {
auto m = dynamic_cast<BandExcludeModule*>(module);
assert(m);
- menu->addChild(new MenuLabel());
menu->addChild(new BoolOptionMenuItem("Exclude direct-output bands from mix", [m]() { return &m->_bandExclude; }));
}
diff --git a/src/trigger_on_load.cpp b/src/trigger_on_load.cpp
@@ -27,6 +27,5 @@ void TriggerOnLoadModule::fromJson(json_t* root) {
void TriggerOnLoadModuleWidget::contextMenu(Menu* menu) {
auto m = dynamic_cast<TriggerOnLoadModule*>(module);
assert(m);
- menu->addChild(new MenuLabel());
menu->addChild(new BoolOptionMenuItem(_menuItemLabel.c_str(), [m]() { return &m->_triggerOnLoad; }));
}
