diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-02 14:33:20 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-06 19:34:32 +1000 |
| commit | 3ea5e4d4b2b0fa3f555a1562acce5fb729b6ca02 (patch) | |
| tree | 51498d4a92a5ba0844e256ca788483592150502f /vendor | |
| parent | 5f77ac8d6f1b1de0af59ca839f2773f34f441c4d (diff) | |
allow scrolling when staging lines or building patch
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/jesseduffield/gocui/tcell_driver.go | 24 | ||||
| -rw-r--r-- | vendor/modules.txt | 4 |
2 files changed, 16 insertions, 12 deletions
diff --git a/vendor/github.com/jesseduffield/gocui/tcell_driver.go b/vendor/github.com/jesseduffield/gocui/tcell_driver.go index 2f992e838..a7faed903 100644 --- a/vendor/github.com/jesseduffield/gocui/tcell_driver.go +++ b/vendor/github.com/jesseduffield/gocui/tcell_driver.go @@ -177,6 +177,8 @@ func pollEvent() GocuiEvent { mouseKey = MouseWheelRight } + wheeling := mouseKey == MouseWheelUp || mouseKey == MouseWheelDown || mouseKey == MouseWheelLeft || mouseKey == MouseWheelRight + // process button events (not wheel events) button &= tcell.ButtonMask(0xff) if button != tcell.ButtonNone && lastMouseKey == tcell.ButtonNone { @@ -210,17 +212,19 @@ func pollEvent() GocuiEvent { } } - switch dragState { - case NOT_DRAGGING: - return GocuiEvent{Type: eventNone} - // if we haven't released the left mouse button and we've moved the cursor then we're dragging - case MAYBE_DRAGGING: - if x != lastX || y != lastY { - dragState = DRAGGING + if !wheeling { + switch dragState { + case NOT_DRAGGING: + return GocuiEvent{Type: eventNone} + // if we haven't released the left mouse button and we've moved the cursor then we're dragging + case MAYBE_DRAGGING: + if x != lastX || y != lastY { + dragState = DRAGGING + } + case DRAGGING: + mouseMod = ModMotion + mouseKey = MouseLeft } - case DRAGGING: - mouseMod = ModMotion - mouseKey = MouseLeft } return GocuiEvent{ diff --git a/vendor/modules.txt b/vendor/modules.txt index c2ce6610a..23dfa0005 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -149,7 +149,7 @@ github.com/jesseduffield/go-git/v5/utils/merkletrie/filesystem github.com/jesseduffield/go-git/v5/utils/merkletrie/index github.com/jesseduffield/go-git/v5/utils/merkletrie/internal/frame github.com/jesseduffield/go-git/v5/utils/merkletrie/noder -# github.com/jesseduffield/gocui v0.3.1-0.20210329131148-bcc4dcd991ff +# github.com/jesseduffield/gocui v0.3.1-0.20210402033412-1238f910f001 ## explicit github.com/jesseduffield/gocui # github.com/jesseduffield/termbox-go v0.0.0-20200823212418-a2289ed6aafe @@ -245,7 +245,7 @@ golang.org/x/sys/windows # golang.org/x/term v0.0.0-20210317153231-de623e64d2a6 ## explicit golang.org/x/term -# golang.org/x/text v0.3.5 +# golang.org/x/text v0.3.6 ## explicit golang.org/x/text/encoding golang.org/x/text/encoding/internal/identifier |