github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add correct window check for wheel events. See description

Browse Source 
Tested that with two windows, events are fired on the correct BrowserWindow instance and not both, and that scrolling a window which is in the background works properly.
This commit is contained in:
Ben Gotow
2016-01-21 16:36:48 -08:00
parent e96e674201
commit d186dceb4b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
atom/browser/native_window_mac.mm
View File

@@ -494,7 +494,7 @@ NativeWindowMac::NativeWindowMac(
event_monitor_.reset([[NSEvent
addLocalMonitorForEventsMatchingMask:NSScrollWheelMask
handler:^NSEvent * _Nullable(NSEvent * event) {
if (![window_ isKeyWindow])
if ([[event window] windowNumber] != [window_ windowNumber])
return event;
if (!web_contents)