mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/pgtk

Browse source
This commit is contained in:
Po Lu 2021-12-09 10:30:18 +08:00
commit 47cd820d93
18 changed files with 290 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/nsterm.m
View file

@ -6658,8 +6658,10 @@ not_in_argv (NSString *arg)
? ceil (fabs (delta)) : 1;
scrollUp = delta > 0;
x = [theEvent scrollingDeltaX];
y = [theEvent scrollingDeltaY];
x = ([theEvent scrollingDeltaX]
* FRAME_COLUMN_WIDTH (emacsframe));
y = ([theEvent scrollingDeltaY]
* FRAME_LINE_HEIGHT (emacsframe));
}
if (lines == 0 && mwheel_coalesce_scroll_events)