mirror of https://github.com/aseprite/aseprite.git
[win] Don't drop text when IME dialog composition is accepted w/Enter
build / build (Debug, macos-latest, lua, cli) (push) Waiting to run
Details
build / build (Debug, macos-latest, noscripts, cli) (push) Waiting to run
Details
build / build (Debug, ubuntu-latest, lua, cli) (push) Waiting to run
Details
build / build (Debug, ubuntu-latest, noscripts, cli) (push) Waiting to run
Details
build / build (Debug, windows-latest, lua, cli) (push) Waiting to run
Details
build / build (Debug, windows-latest, noscripts, cli) (push) Waiting to run
Details
build / build (RelWithDebInfo, macos-latest, lua, gui) (push) Waiting to run
Details
build / build (RelWithDebInfo, ubuntu-latest, lua, gui) (push) Waiting to run
Details
build / build (RelWithDebInfo, windows-latest, lua, gui) (push) Waiting to run
Details
build-auto / build-auto (Debug, macos-latest) (push) Has been cancelled
Details
build-auto / build-auto (Debug, ubuntu-latest) (push) Has been cancelled
Details
build-auto / build-auto (Debug, windows-latest) (push) Has been cancelled
Details
build-auto / build-auto (RelWithDebInfo, macos-latest) (push) Has been cancelled
Details
build-auto / build-auto (RelWithDebInfo, ubuntu-latest) (push) Has been cancelled
Details
build-auto / build-auto (RelWithDebInfo, windows-latest) (push) Has been cancelled
Details
build / build (Debug, macos-latest, lua, cli) (push) Waiting to run
Details
build / build (Debug, macos-latest, noscripts, cli) (push) Waiting to run
Details
build / build (Debug, ubuntu-latest, lua, cli) (push) Waiting to run
Details
build / build (Debug, ubuntu-latest, noscripts, cli) (push) Waiting to run
Details
build / build (Debug, windows-latest, lua, cli) (push) Waiting to run
Details
build / build (Debug, windows-latest, noscripts, cli) (push) Waiting to run
Details
build / build (RelWithDebInfo, macos-latest, lua, gui) (push) Waiting to run
Details
build / build (RelWithDebInfo, ubuntu-latest, lua, gui) (push) Waiting to run
Details
build / build (RelWithDebInfo, windows-latest, lua, gui) (push) Waiting to run
Details
build-auto / build-auto (Debug, macos-latest) (push) Has been cancelled
Details
build-auto / build-auto (Debug, ubuntu-latest) (push) Has been cancelled
Details
build-auto / build-auto (Debug, windows-latest) (push) Has been cancelled
Details
build-auto / build-auto (RelWithDebInfo, macos-latest) (push) Has been cancelled
Details
build-auto / build-auto (RelWithDebInfo, ubuntu-latest) (push) Has been cancelled
Details
build-auto / build-auto (RelWithDebInfo, windows-latest) (push) Has been cancelled
Details
With #5230, now that we can show the IME dialog on Windows, when we are selecting a specific word/composition in the IME dialog, if we press Enter we'll receive that Enter onKeyUp(). It's better if we process the Enter key onKeyDown() (as the IME enter key is not received in that case).
This commit is contained in:
parent
7d91c4b9d9
commit
de1ccb24dd
|
@ -443,12 +443,7 @@ bool WritingTextState::onSetCursor(Editor* editor, const gfx::Point& mouseScreen
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool WritingTextState::onKeyDown(Editor*, KeyMessage*)
|
bool WritingTextState::onKeyDown(Editor*, KeyMessage* msg)
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool WritingTextState::onKeyUp(Editor*, KeyMessage* msg)
|
|
||||||
{
|
{
|
||||||
// Cancel loop pressing Esc key
|
// Cancel loop pressing Esc key
|
||||||
if (msg->scancode() == ui::kKeyEsc) {
|
if (msg->scancode() == ui::kKeyEsc) {
|
||||||
|
@ -457,7 +452,17 @@ bool WritingTextState::onKeyUp(Editor*, KeyMessage* msg)
|
||||||
// Drop text pressing Enter key
|
// Drop text pressing Enter key
|
||||||
else if (msg->scancode() == ui::kKeyEnter) {
|
else if (msg->scancode() == ui::kKeyEnter) {
|
||||||
drop();
|
drop();
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool WritingTextState::onKeyUp(Editor*, KeyMessage* msg)
|
||||||
|
{
|
||||||
|
// Note: We cannot process kKeyEnter key here to drop the text as it
|
||||||
|
// could be received after the Enter key is pressed in the IME
|
||||||
|
// dialog to accept the composition (not to accept the text). So we
|
||||||
|
// process kKeyEnter in onKeyDown().
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue