Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support smooth scrolling #640

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,19 @@
"reason-harfbuzz": "^1.91.5004",
"rench": "^1.9.1",
"rebez": "github:jchavarri/rebez#03fa3b7",
"reason-sdl2": "^2.10.3016",
"reason-sdl2": "*",
"reason-skia": "github:revery-ui/reason-skia#69743dc",
"revery-text-wrap": "github:revery-ui/revery-text-wrap#005385c",
"timber": "*"
"timber": "*",
"libscroll": "*"
},
"resolutions": {
"@esy-ocaml/libffi": "esy-ocaml/libffi#c61127d",
"esy-cmake": "prometheansacrifice/esy-cmake#2a47392def755",
"@opam/cmdliner": "1.0.2",
"timber": "glennsl/timber#ae065bb"
"timber": "glennsl/timber#ae065bb",
"libscroll": "link:../libscroll-re",
"reason-sdl2": "link:../../revery-bryphe/reason-sdl2"
},
"devDependencies": {
"ocaml": "~4.8",
Expand Down
7 changes: 7 additions & 0 deletions src/UI/NodeEvents.re
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ type mouseButtonEventParams = {
type mouseWheelEventParams = {
deltaX: float,
deltaY: float,
containsX: bool,
containsY: bool,
isFling: bool,
isInterrupt: bool,
source: Sdl2.WheelType.t,
timestamp: int,
};

[@deriving show({with_path: false})]
Expand Down Expand Up @@ -83,6 +89,7 @@ type mouseMoveHandler = mouseMoveEventParams => unit;
type mouseOverHandler = mouseMoveEventParams => unit;
type mouseOutHandler = mouseMoveEventParams => unit;
type mouseWheelHandler = mouseWheelEventParams => unit;
type panHandler = panEventParams => unit;
type mouseWindowHandler = Window.t => unit;
type focusHandler = focusEventParams => unit;
type keyDownHandler = keyEventParams => unit;
Expand Down
2 changes: 1 addition & 1 deletion src/UI/dune
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
(name Revery_UI)
(public_name Revery.UI)
(preprocess (pps lwt_ppx ppx_deriving.show))
(libraries brisk-reconciler lwt lwt.unix sdl2 skia flex rebez.lib Revery_Core Revery_Draw Revery_Math))
(libraries brisk-reconciler lwt lwt.unix sdl2 skia flex rebez.lib Revery_Core Revery_Draw Revery_Math Libscroll))
27 changes: 27 additions & 0 deletions src/UI_Components/ScrollView.re
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,19 @@ let%component make =
let%hook (actualScrollLeft, setScrollLeft) = Hooks.state(scrollLeft);
let%hook (bouncingState, setBouncingState) = Hooks.state(Idle);

//let%hook (scrollview, setScrollview) = Hooks.state(() => Libscroll.scrollview_new());
//setScrollview(_ => scrollview);
let%hook (scrollViewRef) = Hooks.ref(None);
let%hook () = Hooks.effect(OnMount, () => {
let scrollView = Libscroll.scrollview_new();
scrollViewRef := Some(scrollView);

let dispose = () => {
scrollViewRef := None;
};
Some(dispose);
});

let%hook (actualScrollTop, _bounceAnimationState, resetBouncingAnimation) =
switch (bouncingState) {
| Idle =>
Expand Down Expand Up @@ -154,8 +167,22 @@ let%component make =
thumbColor=scrollThumbColor
/>
: empty;

/*let pan = (panEvent: NodeEvents.panEventParams) => {
switch (scrollViewRef^) {
| None => ()
| Some(scrollview) => {
let timestamp = wheelEvent.timestamp;
let delta = wheelEvent.delta;
let axis = wheelEvent.axis;
}
}*/

let scroll = (wheelEvent: NodeEvents.mouseWheelEventParams) => {
switch (scrollViewRef^) {
| Some(scrollview) => Libscroll.push_pan(scrollview, Libscroll.Vertical, 10.0)
| None => ()
}
let delta = int_of_float(wheelEvent.deltaY *. 25.);
let newScrollTop = actualScrollTop - delta;

Expand Down