Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #23944 - Manishearth:hl-scroll, r=jdm

Browse source 
Fix scrolling on hololens

This got inverted in https://github.com/servo/servo/pull/23900 by accident, mostly because the old code had two ordering mistakes that cancel each other out.

r? @jdm @paulrouget

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23944)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-08-10 14:21:07 -04:00 • committed by GitHub
commit 2af31be4ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
support/hololens/ServoApp/BrowserPage.cpp
View file

@ -279,7 +279,7 @@ void BrowserPage::OnSurfaceManipulationDelta(
auto y = e.Position().Y; auto y = e.Position().Y;
auto dx = e.Delta().Translation.X; auto dx = e.Delta().Translation.X;
auto dy = e.Delta().Translation.Y; auto dy = e.Delta().Translation.Y;
RunOnGLThread([=] { mServo->Scroll(x, y, dx, dy); }); RunOnGLThread([=] { mServo->Scroll(dx, dy, x, y); });
e.Handled(true); e.Handled(true);
} }