Browse Source

Merge 632f5aa65f into 82ddeb946d

pull/682/merge
Jon Williams GitHub 7 years ago
parent
commit
21ef961902
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
  1. +1
    -0
      include/app.hpp
  2. +5
    -2
      src/app/Knob.cpp

+ 1
- 0
include/app.hpp View File

@@ -200,6 +200,7 @@ struct Knob : ParamWidget {
/** Snap to nearest integer while dragging */
bool snap = false;
float dragValue;
float sensitivity = 0.0;
void onDragStart(EventDragStart &e) override;
void onDragMove(EventDragMove &e) override;
void onDragEnd(EventDragEnd &e) override;


+ 5
- 2
src/app/Knob.cpp View File

@@ -4,7 +4,6 @@
// For GLFW_KEY_LEFT_CONTROL, etc.
#include <GLFW/glfw3.h>


namespace rack {

#define KNOB_SENSITIVITY 0.0015
@@ -17,8 +16,12 @@ void Knob::onDragStart(EventDragStart &e) {
}

void Knob::onDragMove(EventDragMove &e) {
float sens = sensitivity;
if (sens == 0.f) {
sens = KNOB_SENSITIVITY;
}
// Drag slower if Mod
float delta = KNOB_SENSITIVITY * (maxValue - minValue) * -e.mouseRel.y;
float delta = sens * (maxValue - minValue) * -e.mouseRel.y;
if (guiIsModPressed())
delta /= 16.0;
dragValue += delta;


Loading…
Cancel
Save