1 files changed, 8 insertions, 2 deletions
diff --git a/src/Messages.zig b/src/Messages.zig
index cc4b3656..8b6c795d 100644
--- a/src/Messages.zig
+++ b/src/Messages.zig
@@ -356,11 +356,14 @@ pub fn messageMotion(p: *const Pardes, life: Pane.MessageLife) MessageMotion {
             // last frames only settle it. No overshoot: at a row's height
             // and a dozen frames, a follow-through is a pixel or two that
             // reads as a jitter, not a bounce.
-            const left = 1 - t;
+            // The drop follows the Motion flavour (its wind-up, overshoot
+            // and all) over the fall's length.
+            const left = 1 - animation.Motion.of(p.settings.motion).ease(t);
             // The colour leads the motion: solid by half way, so what
             // lands is already legible rather than still fading up.
             const faded = 1 - @min(1, 2 * t);
-            break :blk .{ .alpha = 1 - faded * faded, .slide = -(left * left * left) };
+            // And never behind it, however fast the flavour leaves.
+            break :blk .{ .alpha = @max(1 - faded * faded, std.math.clamp(1 - left, 0, 1)), .slide = -left };
         },
         .leaving => blk: {
             // Counted to its last frame rather than past it, so that frame
@@ -644,6 +647,9 @@ test "a message falls in, lingers past the input that dismisses it, and dissolve
     while (p.nextEffect()) |_| {}
     const pane = p.panes[p.active].?;
     try std.testing.expect(p.settings.message_animation);
+    // Crisp: the flavour whose drop leaves at full speed and lands without
+    // passing its row (the others are the Motion tests').
+    p.settings.motion = .crisp;
     try std.testing.expect(p.executeBuiltinLine(p.active, "MessageLinger 160"));
     try std.testing.expect(p.executeBuiltinLine(p.active, "Msg hello"));
     try std.testing.expectEqual(Pane.MessagePhase.entering, pane.msg_life.phase);