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

Add PgUp/PgDn scrolling support.

Browse source
This commit is contained in:
Glenn Watson 2014-07-18 12:53:33 +10:00
parent c85f6db17b
commit 3ddf2036ab
1 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/components/compositing/platform/common/glfw_windowing.rs
View file

@ -249,17 +249,7 @@ impl Window {
_ => { _ => {
let dx = (xpos as f32) * 30.0; let dx = (xpos as f32) * 30.0;
let dy = (ypos as f32) * 30.0; let dy = (ypos as f32) * 30.0;
self.scroll_window(dx, dy);
let (x, y) = window.get_cursor_pos();
//handle hidpi displays, since GLFW returns non-hi-def coordinates.
let (backing_size, _) = window.get_framebuffer_size();
let (window_size, _) = window.get_size();
let hidpi = (backing_size as f32) / (window_size as f32);
let x = x as f32 * hidpi;
let y = y as f32 * hidpi;
self.event_queue.borrow_mut().push(ScrollWindowEvent(TypedPoint2D(dx, dy),
TypedPoint2D(x as i32, y as i32)));
} }
} }
@ -268,6 +258,20 @@ impl Window {
} }
} }
/// Helper function to send a scroll event.
fn scroll_window(&self, dx: f32, dy: f32) {
let (x, y) = self.glfw_window.get_cursor_pos();
//handle hidpi displays, since GLFW returns non-hi-def coordinates.
let (backing_size, _) = self.glfw_window.get_framebuffer_size();
let (window_size, _) = self.glfw_window.get_size();
let hidpi = (backing_size as f32) / (window_size as f32);
let x = x as f32 * hidpi;
let y = y as f32 * hidpi;
self.event_queue.borrow_mut().push(ScrollWindowEvent(TypedPoint2D(dx, dy),
TypedPoint2D(x as i32, y as i32)));
}
/// Helper function to set the window title in accordance with the ready state. /// Helper function to set the window title in accordance with the ready state.
fn update_window_title(&self) { fn update_window_title(&self) {
let now = time::get_time(); let now = time::get_time();
@ -316,6 +320,14 @@ impl Window {
glfw::KeyBackspace => { // Backspace glfw::KeyBackspace => { // Backspace
self.event_queue.borrow_mut().push(NavigationWindowEvent(Back)); self.event_queue.borrow_mut().push(NavigationWindowEvent(Back));
} }
glfw::KeyPageDown => {
let (_, height) = self.glfw_window.get_size();
self.scroll_window(0.0, -height as f32);
}
glfw::KeyPageUp => {
let (_, height) = self.glfw_window.get_size();
self.scroll_window(0.0, height as f32);
}
_ => {} _ => {}
} }
} }