diff --git a/dpf b/dpf index 9f387dc..1811094 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 9f387dc644c9cbdc47e490d7e22ec4bf38bbbbbd +Subproject commit 18110946d89cb9e4544a90714b109914a5775a8f diff --git a/plugins/wolf-shaper/Common b/plugins/wolf-shaper/Common index a5864cd..609d037 160000 --- a/plugins/wolf-shaper/Common +++ b/plugins/wolf-shaper/Common @@ -1 +1 @@ -Subproject commit a5864cd3e7805fe5b32a0874541dab8732c3bef9 +Subproject commit 609d037445148fa7dc6994c1b4c830e2ecb06854 diff --git a/plugins/wolf-shaper/Makefile b/plugins/wolf-shaper/Makefile index f1ea9ec..d5fb450 100644 --- a/plugins/wolf-shaper/Makefile +++ b/plugins/wolf-shaper/Makefile @@ -38,6 +38,7 @@ OBJS_UI = \ Common/Structures/src/Graph.cpp.o \ Common/Structures/src/Layout.cpp.o \ Common/Structures/src/Animation.cpp.o \ + Common/Widgets/src/WolfWidget.cpp.o \ Common/Widgets/src/GraphNode.cpp.o \ Common/Widgets/src/GraphWidget.cpp.o \ Common/Widgets/src/NanoSwitch.cpp.o \ diff --git a/plugins/wolf-shaper/WolfShaperUI.cpp b/plugins/wolf-shaper/WolfShaperUI.cpp index a068cbf..1aaa6fc 100644 --- a/plugins/wolf-shaper/WolfShaperUI.cpp +++ b/plugins/wolf-shaper/WolfShaperUI.cpp @@ -63,17 +63,6 @@ WolfShaperUI::WolfShaperUI() : UI(665, 665), fLabelsBoxBipolarMode = new GlowingLabelsBox(this, Size(34, 42)); fLabelsBoxBipolarMode->setLabels({"UNI", "BI"}); - fWheelOversample = new OversampleWheel(this, Size(47, 26)); - fWheelOversample->setCallback(this); - fWheelOversample->setRange(0, 4); - - fLabelWheelOversample = new NanoLabel(this, Size(85, 26)); - fLabelWheelOversample->setText("OVERSAMPLE"); - fLabelWheelOversample->setFontId(chivoBoldId); - fLabelWheelOversample->setFontSize(14.0f); - fLabelWheelOversample->setAlign(ALIGN_LEFT | ALIGN_MIDDLE); - fLabelWheelOversample->setMargin(Margin(0, 0, fLabelWheelOversample->getHeight() / 2.0f, 0)); - fLabelPreGain = new LabelBox(this, Size(knobsLabelBoxWidth, knobsLabelBoxHeight)); fLabelPreGain->setText("PRE"); @@ -153,6 +142,17 @@ WolfShaperUI::WolfShaperUI() : UI(665, 665), fLabelButtonResetGraph->setAlign(ALIGN_LEFT | ALIGN_MIDDLE); fLabelButtonResetGraph->setMargin(Margin(6, 0, std::round(fButtonResetGraph->getHeight() / 2.0f) + 1, 0)); + fWheelOversample = new OversampleWheel(this, Size(47, 26)); + fWheelOversample->setCallback(this); + fWheelOversample->setRange(0, 4); + + fLabelWheelOversample = new NanoLabel(this, Size(85, 26)); + fLabelWheelOversample->setText("OVERSAMPLE"); + fLabelWheelOversample->setFontId(chivoBoldId); + fLabelWheelOversample->setFontSize(14.0f); + fLabelWheelOversample->setAlign(ALIGN_LEFT | ALIGN_MIDDLE); + fLabelWheelOversample->setMargin(Margin(0, 0, fLabelWheelOversample->getHeight() / 2.0f, 0)); + positionWidgets(width, height); }