From 1952e9c4e118ab03e62935d30022568aca506bf9 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Tue, 16 Oct 2018 08:00:34 +1100 Subject: Backport: Make damping work in ActionDuration. Backport of changeset 7115:f6d66247a18e. --- src/Document.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Document.cxx b/src/Document.cxx index 57c992a79..3eb2dfc4f 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -101,7 +101,7 @@ void ActionDuration::AddSample(size_t numberActions, double durationOfActions) n const double alpha = 0.25; const double durationOne = durationOfActions / numberActions; - duration = Sci::clamp(alpha * durationOne + (1.0 - alpha) * durationOne, + duration = Sci::clamp(alpha * durationOne + (1.0 - alpha) * duration, minDuration, maxDuration); } -- cgit v1.2.3