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

fix #22075

Browse source 
Combined on_scroll_window_event with on_scroll_start_window_event and on_scroll_end_window_event
This commit is contained in:
fabrizio8 2018-11-02 22:57:53 -04:00
parent ba1ed11ced
commit e3e391b09c
1 changed files with 2 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

35
components/compositing/compositor.rs
View file

@ -166,9 +166,6 @@ pub struct IOCompositor<Window: WindowMethods> {
/// image for the reftest framework. /// image for the reftest framework.
ready_to_save_state: ReadyState, ready_to_save_state: ReadyState,
/// Whether a scroll is in progress; i.e. whether the user's fingers are down.
scroll_in_progress: bool,
in_scroll_transaction: Option<Instant>, in_scroll_transaction: Option<Instant>,
/// The webrender renderer. /// The webrender renderer.
@ -852,10 +849,10 @@ impl<Window: WindowMethods> IOCompositor<Window> {
match phase { match phase {
TouchEventType::Move => self.on_scroll_window_event(delta, cursor), TouchEventType::Move => self.on_scroll_window_event(delta, cursor),
TouchEventType::Up | TouchEventType::Cancel => { TouchEventType::Up | TouchEventType::Cancel => {
self.on_scroll_end_window_event(delta, cursor); self.on_scroll_window_event(delta, cursor);
}, },
TouchEventType::Down => { TouchEventType::Down => {
self.on_scroll_start_window_event(delta, cursor); self.on_scroll_window_event(delta, cursor);
}, },
} }
} }
@ -870,34 +867,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
}); });
} }
fn on_scroll_start_window_event(
&mut self,
scroll_location: ScrollLocation,
cursor: DeviceIntPoint,
) {
self.scroll_in_progress = true;
self.pending_scroll_zoom_events.push(ScrollZoomEvent {
magnification: 1.0,
scroll_location: scroll_location,
cursor: cursor,
event_count: 1,
});
}
fn on_scroll_end_window_event(
&mut self,
scroll_location: ScrollLocation,
cursor: DeviceIntPoint,
) {
self.scroll_in_progress = false;
self.pending_scroll_zoom_events.push(ScrollZoomEvent {
magnification: 1.0,
scroll_location: scroll_location,
cursor: cursor,
event_count: 1,
});
}
fn process_pending_scroll_events(&mut self) { fn process_pending_scroll_events(&mut self) {
let had_events = self.pending_scroll_zoom_events.len() > 0; let had_events = self.pending_scroll_zoom_events.len() > 0;