ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

macOS: Fix momentum scrolling continuing when changing the active window/tab

Browse source 
Fixes #1267
This commit is contained in:
Kovid Goyal 2018-12-26 20:39:04 +05:30
parent fe67e3dde7
commit 64bef38813
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/changelog.rst
View file

@ -31,6 +31,9 @@ Changelog
- Fix using the ``new_tab !neighbor`` action changing the order of the
non-neighboring tabs (:iss:`1256`)
- macOS: Fix momentum scrolling continuing when changing the active window/tab
(:iss:`1267`)
0.13.1 [2018-12-06]
------------------------------

10
kitty/mouse.c
View file

@ -557,6 +557,7 @@ mouse_event(int button, int modifiers, int action) {
void
scroll_event(double UNUSED xoffset, double yoffset, int flags) {
bool in_tab_bar;
static id_type window_for_momentum_scroll = 0;
unsigned int window_idx = 0;
Window *w = window_for_event(&window_idx, &in_tab_bar);
if (!w && !in_tab_bar) {
@ -571,6 +572,15 @@ scroll_event(double UNUSED xoffset, double yoffset, int flags) {
int s;
bool is_high_resolution = flags & 1;
Screen *screen = w->render_data.screen;
int momentum_data = (flags > 1) & 3;
switch(momentum_data) {
case 1:
window_for_momentum_scroll = w->id; break;
case 2:
if (window_for_momentum_scroll != w->id) return;
case 3:
window_for_momentum_scroll = 0; break;
}
if (is_high_resolution) {
yoffset *= OPT(touch_scroll_multiplier);
if (yoffset * global_state.callback_os_window->pending_scroll_pixels < 0) {