Skip to content

Commit

Permalink
Some more zoom work (#1268)
Browse files Browse the repository at this point in the history
- Dragging zones when zoomed takes zoom properly into account.
  Closes #1265
- Zoom speed is proportional to window. Closes #1266
- Mouse wheel zoom gesture with shift and shift/alt inverted.
  Addresses #1263
  • Loading branch information
baconpaul authored Sep 4, 2024
1 parent ec3537a commit 976202e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion libs/sst/sst-jucegui
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ void ZoneLayoutDisplay::mouseDrag(const juce::MouseEvent &e)
auto lb = getLocalBounds().toFloat();
auto displayRegion = lb;

auto kw = displayRegion.getWidth() /
auto kw = hZoom * displayRegion.getWidth() /
(ZoneLayoutKeyboard::lastMidiNote - ZoneLayoutKeyboard::firstMidiNote + 1);
auto vh = displayRegion.getHeight() / 127.0;
auto vh = vZoom * displayRegion.getHeight() / 127.0;

auto dx = e.position.x - lastMousePos.x;
auto &kr = display->mappingView.keyboardRange;
Expand Down Expand Up @@ -328,18 +328,18 @@ void ZoneLayoutDisplay::mouseDrag(const juce::MouseEvent &e)
auto lb = getLocalBounds().toFloat();
auto displayRegion = lb;
auto kw =
displayRegion.getWidth() /
hZoom * displayRegion.getWidth() /
(ZoneLayoutKeyboard::lastMidiNote -
ZoneLayoutKeyboard::firstMidiNote); // this had a +1, which doesn't seem to be needed?
auto vh = displayRegion.getHeight() / 127.0;
auto vh = vZoom * displayRegion.getHeight() / 127.0;

auto newX = e.position.x / kw;
auto newXRounded = std::clamp((int)std::round(e.position.x / kw), 0, 128);
auto newX = e.position.x / kw + hPct * 128;
auto newXRounded = std::clamp((int)std::round(newX), 0, 128);
// These previously had + Keyboard::firstMidiNote, and I don't know why? They don't seem to
// need it.

auto newY = 127 - e.position.y / vh;
auto newYRounded = std::clamp(127 - (int)std::round(e.position.y / vh), 0, 128);
auto newY = 127 - e.position.y / vh - vPct * 128;
auto newYRounded = std::clamp((int)std::round(newY), 0, 128);

// clamps to 128 on purpose, for reasons that'll get clear below

Expand Down

0 comments on commit 976202e

Please sign in to comment.