commit bd6ba87a4f13c4dfe52405d297feaf337ad351d0
parent b60341887c74ce57b11d3621bc4f2057008fd812
Author: Matt Demanett <matt@demanett.net>
Date: Thu, 19 Apr 2018 01:20:24 -0400
Tweak shadows.
Diffstat:
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/widgets.cpp b/src/widgets.cpp
@@ -15,11 +15,12 @@ BGKnob::BGKnob(const char* svg, int dim) {
box.size = Vec(dim, dim);
shadow->blurRadius = 2.0;
// k->shadow->opacity = 0.15;
- shadow->box.pos = Vec(0.0, 3.0); // Vec(0.0, box.size.y * 0.1);
+ shadow->box.pos = Vec(0.0, 3.0);
}
Knob16::Knob16() : BGKnob("res/knob_16px.svg", 16) {
+ shadow->box.pos = Vec(0.0, 2.5);
}
@@ -36,23 +37,38 @@ Knob38::Knob38() : BGKnob("res/knob_38px.svg", 38) {
Knob68::Knob68() : BGKnob("res/knob_68px.svg", 68) {
+ shadow->box.pos = Vec(0.0, 4.0);
}
Port24::Port24() {
setSVG(SVG::load(assetPlugin(plugin, "res/port.svg")));
box.size = Vec(24, 24);
- shadow->box.pos = Vec(0.0, 1.3);
+ shadow->blurRadius = 1.0;
+ shadow->box.pos = Vec(0.0, 1.5);
+}
+
+
+SliderSwitch::SliderSwitch() {
+ shadow = new CircularShadow();
+ addChild(shadow);
+ shadow->box.size = Vec();
}
SliderSwitch2State14::SliderSwitch2State14() {
addFrame(SVG::load(assetPlugin(plugin, "res/slider_switch_2_14px_0.svg")));
addFrame(SVG::load(assetPlugin(plugin, "res/slider_switch_2_14px_1.svg")));
+ shadow->box.size = Vec(14.0, 24.0);
+ shadow->blurRadius = 1.0;
+ shadow->box.pos = Vec(0.0, 7.0);
}
StatefulButton::StatefulButton(const char* offSVGPath, const char* onSVGPath) {
+ shadow = new CircularShadow();
+ addChild(shadow);
+
_svgWidget = new SVGWidget();
addChild(_svgWidget);
@@ -62,6 +78,9 @@ StatefulButton::StatefulButton(const char* offSVGPath, const char* onSVGPath) {
_svgWidget->setSVG(svg);
box.size = _svgWidget->box.size;
+ shadow->box.size = _svgWidget->box.size;
+ shadow->blurRadius = 1.0;
+ shadow->box.pos = Vec(0.0, 1.0);
}
void StatefulButton::step() {
diff --git a/src/widgets.hpp b/src/widgets.hpp
@@ -38,13 +38,19 @@ struct Port24 : SVGPort {
Port24();
};
-struct SliderSwitch2State14 : SVGSwitch, ToggleSwitch {
+struct SliderSwitch : SVGSwitch, ToggleSwitch {
+ CircularShadow* shadow = NULL;
+ SliderSwitch();
+};
+
+struct SliderSwitch2State14 : SliderSwitch {
SliderSwitch2State14();
};
struct StatefulButton : ParamWidget, FramebufferWidget {
std::vector<std::shared_ptr<SVG>> _frames;
SVGWidget* _svgWidget; // deleted elsewhere.
+ CircularShadow* shadow = NULL;
StatefulButton(const char* offSVGPath, const char* onSVGPath);
void step() override;