Skip to content

Commit 4bfb553

Browse files
committed
Make NanoWheel cursor manipulation less broken
1 parent d3e869c commit 4bfb553

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

dpf

Submodule dpf updated from 9f387dc to 1811094

plugins/wolf-shaper/Common

plugins/wolf-shaper/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ OBJS_UI = \
3838
Common/Structures/src/Graph.cpp.o \
3939
Common/Structures/src/Layout.cpp.o \
4040
Common/Structures/src/Animation.cpp.o \
41+
Common/Widgets/src/WolfWidget.cpp.o \
4142
Common/Widgets/src/GraphNode.cpp.o \
4243
Common/Widgets/src/GraphWidget.cpp.o \
4344
Common/Widgets/src/NanoSwitch.cpp.o \

plugins/wolf-shaper/WolfShaperUI.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,6 @@ WolfShaperUI::WolfShaperUI() : UI(665, 665),
6363
fLabelsBoxBipolarMode = new GlowingLabelsBox(this, Size<uint>(34, 42));
6464
fLabelsBoxBipolarMode->setLabels({"UNI", "BI"});
6565

66-
fWheelOversample = new OversampleWheel(this, Size<uint>(47, 26));
67-
fWheelOversample->setCallback(this);
68-
fWheelOversample->setRange(0, 4);
69-
70-
fLabelWheelOversample = new NanoLabel(this, Size<uint>(85, 26));
71-
fLabelWheelOversample->setText("OVERSAMPLE");
72-
fLabelWheelOversample->setFontId(chivoBoldId);
73-
fLabelWheelOversample->setFontSize(14.0f);
74-
fLabelWheelOversample->setAlign(ALIGN_LEFT | ALIGN_MIDDLE);
75-
fLabelWheelOversample->setMargin(Margin(0, 0, fLabelWheelOversample->getHeight() / 2.0f, 0));
76-
7766
fLabelPreGain = new LabelBox(this, Size<uint>(knobsLabelBoxWidth, knobsLabelBoxHeight));
7867
fLabelPreGain->setText("PRE");
7968

@@ -153,6 +142,17 @@ WolfShaperUI::WolfShaperUI() : UI(665, 665),
153142
fLabelButtonResetGraph->setAlign(ALIGN_LEFT | ALIGN_MIDDLE);
154143
fLabelButtonResetGraph->setMargin(Margin(6, 0, std::round(fButtonResetGraph->getHeight() / 2.0f) + 1, 0));
155144

145+
fWheelOversample = new OversampleWheel(this, Size<uint>(47, 26));
146+
fWheelOversample->setCallback(this);
147+
fWheelOversample->setRange(0, 4);
148+
149+
fLabelWheelOversample = new NanoLabel(this, Size<uint>(85, 26));
150+
fLabelWheelOversample->setText("OVERSAMPLE");
151+
fLabelWheelOversample->setFontId(chivoBoldId);
152+
fLabelWheelOversample->setFontSize(14.0f);
153+
fLabelWheelOversample->setAlign(ALIGN_LEFT | ALIGN_MIDDLE);
154+
fLabelWheelOversample->setMargin(Margin(0, 0, fLabelWheelOversample->getHeight() / 2.0f, 0));
155+
156156
positionWidgets(width, height);
157157
}
158158

0 commit comments

Comments
 (0)