Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 82f0f64

Browse files
committed
servo: Merge #14597 - FIX for Implement scroll transactions (from gterzian:fix_scroll_transactions); r=mbrubeck
<!-- Please describe your changes on the following line: --> Follow up on servo/servo#14470 @mbrubeck @KiChjang @glennw I just found out in the context of servo/webrender#600 I forgot to add a case for the very first scroll event, or else the scrolling on that PR, in a non-Mac OS environment, will only start after an 80ms pause following the initial scroll event... Sorry this slipped through my initial testing... --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 139c111091210a5002bda668d14debb2e1c68ca9
1 parent 141c97e commit 82f0f64

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

servo/components/compositing/compositor.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,6 +1081,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
10811081
delta: TypedPoint2D<f32, DevicePixel>,
10821082
cursor: TypedPoint2D<i32, DevicePixel>) {
10831083
let event_phase = match (self.scroll_in_progress, self.in_scroll_transaction) {
1084+
(false, None) => ScrollEventPhase::Start,
10841085
(false, Some(last_scroll)) if last_scroll.elapsed() > Duration::from_millis(80) =>
10851086
ScrollEventPhase::Start,
10861087
(_, _) => ScrollEventPhase::Move(self.scroll_in_progress),

0 commit comments

Comments
 (0)