1
1
mirror of https://github.com/qvacua/vimr.git synced 2024-11-23 19:21:53 +03:00

Merge branch 'issue/237-scroll' into develop

This commit is contained in:
Tae Won Ha 2016-11-12 17:04:43 +01:00
commit 3274dd0e94
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
2 changed files with 20 additions and 6 deletions

View File

@ -1011,12 +1011,25 @@ extension NeoVimView {
if deltaX == 0 && deltaY == 0 {
return
}
let isTrackpad = event.hasPreciseScrollingDeltas
let cellPosition = self.cellPositionFor(event: event)
let (vimInputX, vimInputY) = self.vimScrollInputFor(deltaX: deltaX, deltaY: deltaY,
modifierFlags: event.modifierFlags,
cellPosition: cellPosition)
modifierFlags: event.modifierFlags,
cellPosition: cellPosition)
// We patched neovim such that it scrolls only 1 line for each scroll input. The default is 3 and for mouse
// scrolling we restore the original behavior.
if isTrackpad == false {
(0..<3).forEach { _ in
self.agent.vimInput(vimInputX)
self.agent.vimInput(vimInputY)
}
return
}
let (absDeltaX, absDeltaY) = (abs(deltaX), abs(deltaY))
// The absolute delta values can get very very big when you use two finger scrolling on the trackpad:
@ -1114,8 +1127,8 @@ extension NeoVimView {
}
fileprivate func vimScrollInputFor(deltaX: CGFloat, deltaY: CGFloat,
modifierFlags: NSEventModifierFlags,
cellPosition: Position) -> (String, String)
modifierFlags: NSEventModifierFlags,
cellPosition: Position) -> (String, String)
{
let vimMouseLocation = self.wrapNamedKeys("\(cellPosition.row),\(cellPosition.column)")

View File

@ -5,6 +5,7 @@
* GH-334: `set` `title` and `termguicolors` by default such that airline works without changing `init.vim`.
* GH-276: Draw a different, i.e. thin, cursor in the insert mode.
* GH-299: Add a context menu to the file browser.
* GH-237: Increase mouse scrollwheel sensitivity.
# 0.10.1-122