Skip to content

fix(cursor): smooth-zoom ease-out cut-off fires; no jump at the end of a zoom #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Maxaubert merged 1 commit into from
Oct 7, 2026
Merged

fix(cursor): smooth-zoom ease-out cut-off fires; no jump at the end of a zoom #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,6 +1359,7 @@ static void RunTick(TickState& t) {
// smooth ramp, merely delayed. Gated on level > 1.0 so the session still enters and the
// freeze holds it at ~1.01 until the hold expires.
const bool quiesceFreeze = QuiesceHoldActive(t) && t.zoom.level() > 1.0;
if (!quiesceFreeze) t.zoom.tick(dt < kMaxZoomDt ? dt : kMaxZoomDt);
// SMOOTH-ZOOM RELEASE (issue #369, src/zoom_ladder.h EaseOutShouldStop). With smooth sampling and
// the zoom ladder, a slow zoom must cross DWM's whole-pixel rounding steps, each an image jump of
// about the level in px; snapping the slow tail hopped, holding it froze then caught up (field).
Expand All @@ -1367,6 +1368,8 @@ static void RunTick(TickState& t) {
{
auto& zs = g_input.state();
const bool held = zs.inHeld.load() || zs.outHeld.load() || g_input.anyBoundKeyPressed();
// AFTER the controller ticked: before it, level() still equals last frame's level, so the
// "still moving" test never fired and the ease-out always ran its slow tail (#375).
if (!held && !t.zoom.hasTarget() && t.cfg.txSamplingMode == 1 && t.cfg.txSmoothLadder != 0 &&
t.zoom.level() != t.prevLvl && wind::EaseOutShouldStop(t.zoom.level(), t.prevLvl)) {
if (auto* tmStop = dynamic_cast<TransformModel*>(t.model)) {
Expand All @@ -1376,7 +1379,6 @@ static void RunTick(TickState& t) {
}
t.prevZoomHeld = held;
}
if (!quiesceFreeze) t.zoom.tick(dt < kMaxZoomDt ? dt : kMaxZoomDt);
// Recenter on a recenterVk key press (rising edge).
bool recenter = false;
bool recenterDown = comboHeld(t.cfg.recenterVk, t.cfg.recenterMods); // mods since #307
Expand Down
6 changes: 6 additions & 0 deletions src/transform_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,12 @@ void TransformModel::present(const MapResult& r, double level, const Config& cfg
if (cfg.txSmoothLadder != 0 && cfg.txSamplingMode == 1 && applyLevel > 1.001) {
if (applyLevel == level && level == ladderReq_ && ladderOut_ > 0.0) {
applyLevel = ladderOut_;
} else if (lastLevel_ > 1.001 && std::fabs(applyLevel - lastLevel_) <= applyLevel * 1e-9) {
// The request IS the level on screen (RunTick stopped the ease-out there): never re-snap
// it, or the zoom jumps to a neighbouring clean level after it stopped (#375).
ladderReq_ = level;
ladderOut_ = lastLevel_;
applyLevel = lastLevel_;
} else if (rampStopped && applyLevel == level && lastLevel_ > 1.001 &&
std::fabs(lastLevel_ - level) <= level * (SnapWindow(level) + 1e-5)) {
// The zoom just stopped: keep the level already on screen rather than re-snapping, so
Expand Down
Loading