asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #42773 from bruvzg/macos_inertia_32

Browse source 
[macOS, 3.2] Suppress momentum scrolling after key press.
This commit is contained in:
Rémi Verschelde 2020-10-20 15:11:02 +02:00 committed by GitHub
commit 0181819339
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
platform/osx/os_osx.mm
View file

@ -105,6 +105,7 @@ static int mouse_x = 0;
static int mouse_y = 0; static int mouse_y = 0;
static int button_mask = 0; static int button_mask = 0;
static bool mouse_down_control = false; static bool mouse_down_control = false;
static bool ignore_momentum_scroll = false;
static Vector2 get_mouse_pos(NSPoint locationInWindow) { static Vector2 get_mouse_pos(NSPoint locationInWindow) {
@ -1179,6 +1180,8 @@ static int remapKey(unsigned int key, unsigned int state) {
- (void)keyDown:(NSEvent *)event { - (void)keyDown:(NSEvent *)event {
ignore_momentum_scroll = true;
// Ignore all input if IME input is in progress // Ignore all input if IME input is in progress
if (!imeInputEventInProgress) { if (!imeInputEventInProgress) {
NSString *characters = [event characters]; NSString *characters = [event characters];
@ -1219,6 +1222,8 @@ static int remapKey(unsigned int key, unsigned int state) {
- (void)flagsChanged:(NSEvent *)event { - (void)flagsChanged:(NSEvent *)event {
ignore_momentum_scroll = true;
// Ignore all input if IME input is in progress // Ignore all input if IME input is in progress
if (!imeInputEventInProgress) { if (!imeInputEventInProgress) {
OS_OSX::KeyEvent ke; OS_OSX::KeyEvent ke;
@ -1359,6 +1364,13 @@ inline void sendPanEvent(double dx, double dy, int modifierFlags) {
deltaY *= 0.03; deltaY *= 0.03;
} }
if ([event momentumPhase] != NSEventPhaseNone) {
if (ignore_momentum_scroll) {
return;
}
} else {
ignore_momentum_scroll = false;
}
if ([event phase] != NSEventPhaseNone || [event momentumPhase] != NSEventPhaseNone) { if ([event phase] != NSEventPhaseNone || [event momentumPhase] != NSEventPhaseNone) {
sendPanEvent(deltaX, deltaY, [event modifierFlags]); sendPanEvent(deltaX, deltaY, [event modifierFlags]);
} else { } else {