Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 18:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 501496 part.5 Don't dispatch keypress events if defaultPrevent() of the keydown event is called on OS/2 r=smaug

Browse Source
This commit is contained in:
Masayuki Nakano 2013-07-25 15:09:28 +09:00
parent 236130b569
commit 4d5158de01
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widget/os2/nsWindow.cpp
View File

@ -2157,6 +2157,8 @@ bool nsWindow::OnMouseChord(MPARAM mp1, MPARAM mp2)
isCopy = true;
}
// XXX Using keypress event here is wrong approach, this should be replaced
// with content command event.
nsKeyEvent event(true, NS_KEY_PRESS, this);
nsIntPoint point(0,0);
InitEvent(event, &point);
@ -2793,6 +2795,11 @@ bool nsWindow::DispatchKeyEvent(MPARAM mp1, MPARAM mp2)
return rc;
}
// Don't dispatch keypress event if keydown event is consumed.
if (rc) {
return rc;
}
// Break off if we've got an "invalid composition" -- that is,
// the user typed a deadkey last time, but has now typed something
// that doesn't make sense in that context.
@ -2805,9 +2812,6 @@ bool nsWindow::DispatchKeyEvent(MPARAM mp1, MPARAM mp2)
// Now we need to dispatch a keypress event which has the unicode char.
// If keydown default was prevented, do same for keypress
pressEvent.message = NS_KEY_PRESS;
if (rc) {
pressEvent.mFlags.mDefaultPrevented = true;
}
if (usChar) {
USHORT inbuf[2];