From c6840fc6f5cbdfe9304c71f308315ec0ae869f09 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Tue, 19 Apr 2016 16:08:58 +0300 Subject: [PATCH] IDEA-150906 Mac scroll tuning: improve animation accuracy --- .../src/com/intellij/ui/components/DefaultScrollBarUI.java | 4 ++-- .../src/com/intellij/ui/components/TwoWayAnimator.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ui/components/DefaultScrollBarUI.java b/platform/platform-api/src/com/intellij/ui/components/DefaultScrollBarUI.java index 111135eb8600..fe08ba5f8afd 100644 --- a/platform/platform-api/src/com/intellij/ui/components/DefaultScrollBarUI.java +++ b/platform/platform-api/src/com/intellij/ui/components/DefaultScrollBarUI.java @@ -44,13 +44,13 @@ class DefaultScrollBarUI extends ScrollBarUI { private final Listener myListener = new Listener(); private final Timer myScrollTimer = UIUtil.createNamedTimer("ScrollBarThumbScrollTimer", 60, myListener); - final TwoWayAnimator myTrackAnimator = new TwoWayAnimator("ScrollBarTrack", 6, 125, 150, 300) { + final TwoWayAnimator myTrackAnimator = new TwoWayAnimator("ScrollBarTrack", 11, 150, 125, 300, 125) { @Override void onValueUpdate() { repaint(); } }; - final TwoWayAnimator myThumbAnimator = new TwoWayAnimator("ScrollBarThumb", 6, 125, 150, 300) { + final TwoWayAnimator myThumbAnimator = new TwoWayAnimator("ScrollBarThumb", 11, 150, 125, 300, 125) { @Override void onValueUpdate() { repaint(); diff --git a/platform/platform-api/src/com/intellij/ui/components/TwoWayAnimator.java b/platform/platform-api/src/com/intellij/ui/components/TwoWayAnimator.java index 84a017cfdbef..32d2304d7817 100644 --- a/platform/platform-api/src/com/intellij/ui/components/TwoWayAnimator.java +++ b/platform/platform-api/src/com/intellij/ui/components/TwoWayAnimator.java @@ -32,10 +32,10 @@ abstract class TwoWayAnimator { abstract void onValueUpdate(); - TwoWayAnimator(String name, int totalFrames, int cycleDuration, int pauseForward, int pauseBackward) { + TwoWayAnimator(String name, int totalFrames, int pauseForward, int durationForward, int pauseBackward, int durationBackward) { myMaxFrame = totalFrames - 1; - myForwardAnimator = new MyAnimator(name + "ForwardAnimator", totalFrames, cycleDuration, pauseForward, true); - myBackwardAnimator = new MyAnimator(name + "BackwardAnimator", totalFrames, cycleDuration, pauseBackward, false); + myForwardAnimator = new MyAnimator(name + "ForwardAnimator", totalFrames, durationForward, pauseForward, true); + myBackwardAnimator = new MyAnimator(name + "BackwardAnimator", totalFrames, durationBackward, pauseBackward, false); } void start(boolean forward) {