KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix-mouse-scroll' of https://github.com/page-down/kitty

Browse Source
This commit is contained in:
Kovid Goyal 2021-12-17 22:15:55 +05:30
commit 0c4bd96f87
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kitty/mouse.c
View File

@ -778,12 +778,20 @@ scroll_event(double UNUSED xoffset, double yoffset, int flags, int modifiers) {
static id_type window_for_momentum_scroll = 0; static id_type window_for_momentum_scroll = 0;
static bool main_screen_for_momentum_scroll = false; static bool main_screen_for_momentum_scroll = false;
unsigned int window_idx = 0; unsigned int window_idx = 0;
// allow scroll events even if window is not currently focused (in
// which case on some platforms such as macOS the mouse location is zeroed so
// window_for_event() does not work).
OSWindow *osw = global_state.callback_os_window;
if (!osw->is_focused && osw->handle) {
double mouse_x, mouse_y;
glfwGetCursorPos((GLFWwindow*)osw->handle, &mouse_x, &mouse_y);
osw->mouse_x = mouse_x * osw->viewport_x_ratio;
osw->mouse_y = mouse_y * osw->viewport_y_ratio;
}
Window *w = window_for_event(&window_idx, &in_tab_bar); Window *w = window_for_event(&window_idx, &in_tab_bar);
if (!w && !in_tab_bar) { if (!w && !in_tab_bar) {
// allow scroll events even if window is not currently focused (in // fallback to last active window
// which case on some platforms such as macOS the mouse location is zeroed so Tab *t = osw->tabs + osw->active_tab;
// window_for_event() does not work).
Tab *t = global_state.callback_os_window->tabs + global_state.callback_os_window->active_tab;
if (t) w = t->windows + t->active_window; if (t) w = t->windows + t->active_window;
} }
if (!w) return; if (!w) return;