From 60592ae0d7a98e071e516fcac70c5bf1427f20be Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Thu, 22 Feb 2024 08:38:12 +0800 Subject: IME composition is now replaced by the result instead of being printed alongside. For now, it always gets reset from the start after pressing Return, which is to be fixed next. --- indra/newview/llviewerwindow.cpp | 4 ++-- indra/newview/llviewerwindow.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 405da33bdf..86ca03fa4a 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -3129,11 +3129,11 @@ BOOL LLViewerWindow::handleUnicodeChar(llwchar uni_char, MASK mask) return FALSE; } -BOOL LLViewerWindow::handleUnicodeString(char *uni_str) +BOOL LLViewerWindow::handleUnicodeString(char *uni_str, bool editing) { auto keyboard_focus = gFocusMgr.getKeyboardFocus(); if (keyboard_focus) - keyboard_focus->handleUnicodeString(uni_str, FALSE); + keyboard_focus->handleUnicodeString(uni_str, editing, FALSE); return TRUE; } diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index fe20b5fa23..1e3a03ab50 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -192,7 +192,7 @@ public: /*virtual*/ BOOL handleTranslatedKeyUp(KEY key, MASK mask); /*virtual*/ void handleScanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level); /*virtual*/ BOOL handleUnicodeChar(llwchar uni_char, MASK mask); // NOT going to handle extended - /*virtual*/ BOOL handleUnicodeString(char *uni_str); + /*virtual*/ BOOL handleUnicodeString(char *uni_str, bool editing); /*virtual*/ BOOL handleMouseDown(LLWindow *window, LLCoordGL pos, MASK mask); /*virtual*/ BOOL handleMouseUp(LLWindow *window, LLCoordGL pos, MASK mask); /*virtual*/ BOOL handleCloseRequest(LLWindow *window); -- cgit v1.2.3