Slider keyboard interface

Paul-Dempsey · Oct 5, 2023 · 112e8f5 · 112e8f5
1 parent 328b990
commit 112e8f5
Show file tree

Hide file tree

Showing 2 changed files with 95 additions and 4 deletions.
diff --git a/src/Pedals/Pedals.cpp b/src/Pedals/Pedals.cpp
@@ -101,9 +101,10 @@ void PedalCore::syncAssign(Hc1Module * partner)
 void PedalCore::syncValue(Hc1Module * partner)
 {
     auto pq = getParamQuantity(Params::P_PEDAL_VALUE);
-    auto value = static_cast<uint8_t>(pq->getValue());
+    auto value = static_cast<uint8_t>(std::round(pq->getValue()));
     if (value != last_pedal_value) {
         last_pedal_value = value;
+        if (!partner->readyToSend()) return;
         PedalInfo & pedal = partner->getPedal(pedal_id);
         partner->sendControlChange(0, pedal.cc, value);
     }
@@ -113,11 +114,12 @@ void PedalCore::process(const ProcessArgs& args)
 {
     auto partner = getPartner();
     if (!partner) return;
+    if (!partner->readyToSend()) return;
 
     auto pedal = partner->getPedal(pedal_id);
-    getOutput(Outputs::O_PEDAL_VALUE).setVoltage(10.f * pedal.value / 127);
-
-    if (!partner->readyToSend()) return;
+    if (getOutput(Outputs::O_PEDAL_VALUE).isConnected()) {
+        getOutput(Outputs::O_PEDAL_VALUE).setVoltage(10.f * pedal.value / 127);
+    }
 
     if (++check_cv > CV_INTERVAL) {
         check_cv = 0;

diff --git a/src/widgets/vert_slider.hpp b/src/widgets/vert_slider.hpp
@@ -21,6 +21,7 @@ struct VerticalSlider : SvgSlider
             FillRect(args.vg, 1.5f, break_pos, box.size.x - 3.f, box.size.y - break_pos, value_bg);
         }
     };
+
 	VerticalSlider()
     {
 		setBackgroundSvg(Svg::load(asset::plugin(pluginInstance, "res/VertSlider_bg.svg")));
@@ -31,6 +32,94 @@ struct VerticalSlider : SvgSlider
         fb->addChildBelow(fill, handle);
         handle->box.pos.y = 198.f;
     }
+
+    void onHover(const HoverEvent& e) override
+    {
+        e.consume(this);
+    }
+    void onEnter(const EnterEvent& e) override {
+        APP->event->setSelectedWidget(this);
+        e.consume(this);
+    }
+    void onLeave(const LeaveEvent& e) override {
+        APP->event->setSelectedWidget(nullptr);
+        SvgSlider::onLeave(e);
+    }
+
+    void onSelectKey(const SelectKeyEvent& e) override
+    {
+        if (e.action == GLFW_PRESS || e.action == GLFW_REPEAT)
+        {
+            auto pq = getParamQuantity();
+            if (pq)
+            {
+                bool plain = (e.action != GLFW_REPEAT) && ((e.mods & RACK_MOD_MASK) == 0);
+                bool shift = e.mods & GLFW_MOD_SHIFT;
+                // bool ctrl = e.mods & GLFW_MOD_CONTROL;
+                switch (e.key)
+                {
+                case GLFW_KEY_0:
+                    pq->setValue(pq->getMaxValue());
+                    e.consume(this);
+                    break;
+                case GLFW_KEY_1: case GLFW_KEY_2: case GLFW_KEY_3: case GLFW_KEY_4:
+                case GLFW_KEY_5: case GLFW_KEY_6: case GLFW_KEY_7: case GLFW_KEY_8: case GLFW_KEY_9:
+                    pq->setValue(14.1f * (e.key - GLFW_KEY_1));
+                    e.consume(this);
+                    break;
+
+                case GLFW_KEY_HOME:
+                    if (plain) {
+                        pq->setValue(pq->getMaxValue());
+                        e.consume(this);
+                    }
+                    break;
+                case GLFW_KEY_END:
+                    if (plain) {
+                        pq->setValue(pq->getMinValue());
+                        e.consume(this);
+                    }
+                    break;
+                case GLFW_KEY_UP:
+                    pq->setValue(pq->getValue() + (shift ? 10.f : 1.f));
+                    e.consume(this);
+                    break;
+                case GLFW_KEY_DOWN:
+                    pq->setValue(pq->getValue() - (shift ? 10.f : 1.f));
+                    e.consume(this);
+                    break;
+                case GLFW_KEY_PAGE_UP:
+                    pq->setValue(pq->getValue() + 10.f);
+                    e.consume(this);
+                    break;
+                case GLFW_KEY_PAGE_DOWN:
+                    pq->setValue(pq->getValue() - 10.f);
+                    e.consume(this);
+                    break;
+                }
+            }
+        }
+        if (e.isConsumed())
+            return;
+        SvgSlider::onSelectKey(e);
+    }
+
+    void onHoverScroll(const HoverScrollEvent & e) override
+    {
+        auto pq = getParamQuantity();
+        if (pq) {
+            auto dx = e.scrollDelta;
+            auto mods = APP->window->getMods();
+            if (dx.y < 0.f) {
+                pq->setValue(pq->getValue() - ((mods & GLFW_MOD_SHIFT) ? 10.f : 1.f));
+            } else if (dx.y > 0.f) {
+                pq->setValue(pq->getValue() + ((mods & GLFW_MOD_SHIFT) ? 10.f : 1.f));
+            }
+            e.consume(this);
+        } else {
+            SvgSlider::onHoverScroll(e);
+        }
+    }
 };