hasufell
/
neovim-gtk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #32 from christopher-l/smooth-scrolling 

Enable scrolling with smooth scroll
This commit is contained in:
daa84 2017-12-13 13:02:31 +03:00 committed by GitHub
parent 8f0b6dd6e6 02c5276e62
commit d938b2ef76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/shell.rs
View File

@ -353,11 +353,15 @@ impl State {
pub struct UiState { pub struct UiState {
mouse_pressed: bool, mouse_pressed: bool,
scroll_delta: (f64, f64),
} }
impl UiState { impl UiState {
pub fn new() -> UiState { pub fn new() -> UiState {
UiState { mouse_pressed: false } UiState {
mouse_pressed: false,
scroll_delta: (0.0, 0.0),
}
} }
} }
@ -429,8 +433,8 @@ impl Shell {
state.drawing_area.set_events( state.drawing_area.set_events(
(gdk_sys::GDK_BUTTON_RELEASE_MASK | gdk_sys::GDK_BUTTON_PRESS_MASK | (gdk_sys::GDK_BUTTON_RELEASE_MASK | gdk_sys::GDK_BUTTON_PRESS_MASK |
gdk_sys::GDK_BUTTON_MOTION_MASK | gdk_sys::GDK_BUTTON_MOTION_MASK | gdk_sys::GDK_SCROLL_MASK |
gdk_sys::GDK_SCROLL_MASK) gdk_sys::GDK_SMOOTH_SCROLL_MASK)
.bits() as i32, .bits() as i32,
); );
@ -502,8 +506,9 @@ impl Shell {
}); });
let ref_state = self.state.clone(); let ref_state = self.state.clone();
let ref_ui_state = self.ui_state.clone();
state.drawing_area.connect_scroll_event(move |_, ev| { state.drawing_area.connect_scroll_event(move |_, ev| {
gtk_scroll_event(&mut *ref_state.borrow_mut(), ev) gtk_scroll_event(&mut *ref_state.borrow_mut(), &mut *ref_ui_state.borrow_mut(), ev)
}); });
let ref_state = self.state.clone(); let ref_state = self.state.clone();
@ -639,7 +644,7 @@ fn gtk_focus_out(state: &mut State) -> Inhibit {
Inhibit(false) Inhibit(false)
} }
fn gtk_scroll_event(state: &mut State, ev: &EventScroll) -> Inhibit { fn gtk_scroll_event(state: &mut State, ui_state: &mut UiState, ev: &EventScroll) -> Inhibit {
if !state.mouse_enabled { if !state.mouse_enabled {
return Inhibit(false); return Inhibit(false);
} }
@ -659,7 +664,30 @@ fn gtk_scroll_event(state: &mut State, ev: &EventScroll) -> Inhibit {
gdk_sys::GdkScrollDirection::Down => { gdk_sys::GdkScrollDirection::Down => {
mouse_input(state, "ScrollWheelDown", ev.get_state(), ev.get_position()) mouse_input(state, "ScrollWheelDown", ev.get_state(), ev.get_position())
} }
_ => (), gdk_sys::GdkScrollDirection::Smooth => {
// Remember and accumulate scroll deltas, so slow scrolling still
// works.
ui_state.scroll_delta.0 += ev.as_ref().delta_x;
ui_state.scroll_delta.1 += ev.as_ref().delta_y;
// Perform scroll action for deltas with abs(delta) >= 1.
let x = ui_state.scroll_delta.0 as isize;
let y = ui_state.scroll_delta.1 as isize;
for _ in 0..x {
mouse_input(state, "ScrollWheelRight", ev.get_state(), ev.get_position())
}
for _ in 0..-x {
mouse_input(state, "ScrollWheelLeft", ev.get_state(), ev.get_position())
}
for _ in 0..y {
mouse_input(state, "ScrollWheelDown", ev.get_state(), ev.get_position())
}
for _ in 0..-y {
mouse_input(state, "ScrollWheelUp", ev.get_state(), ev.get_position())
}
// Subtract performed scroll deltas.
ui_state.scroll_delta.0 -= x as f64;
ui_state.scroll_delta.1 -= y as f64;
}
} }
Inhibit(false) Inhibit(false)
} }