From 444b3e3c6665d1f44aa9a308685cde898cfb1749 Mon Sep 17 00:00:00 2001 From: Guldoman Date: Tue, 26 Apr 2022 15:54:11 +0200 Subject: [PATCH] Don't animate scrolling by dragging the scroll bar (#940) Also added the `config.animate_drag_scroll` option to re-enable the behavior. --- data/core/config.lua | 1 + data/core/view.lua | 3 +++ 2 files changed, 4 insertions(+) diff --git a/data/core/config.lua b/data/core/config.lua index 417291fe..691b9259 100644 --- a/data/core/config.lua +++ b/data/core/config.lua @@ -4,6 +4,7 @@ config.fps = 60 config.max_log_items = 80 config.message_timeout = 5 config.mouse_wheel_scroll = 50 * SCALE +config.animate_drag_scroll = false config.scroll_past_end = true config.file_size_limit = 10 config.ignore_files = { "^%." } diff --git a/data/core/view.lua b/data/core/view.lua index cdf07f4c..f9157c08 100644 --- a/data/core/view.lua +++ b/data/core/view.lua @@ -134,6 +134,9 @@ function View:on_mouse_moved(x, y, dx, dy) if self.dragging_scrollbar then local delta = self:get_scrollable_size() / self.size.y * dy self.scroll.to.y = self.scroll.to.y + delta + if not config.animate_drag_scroll then + self.scroll.y = self.scroll.to.y + end end self.hovered_scrollbar = self:scrollbar_overlaps_point(x, y) self.hovered_scrollbar_track = self.hovered_scrollbar or self:scrollbar_track_overlaps_point(x, y)