IME Cleanup: Removal of BLT_lang_is_ime_supported
Removal of BLT_lang_is_ime_supported which is always returns true and is no longer needed. See D11800 for more details. Differential Revision: https://developer.blender.org/D11800 Reviewed by Campbell Barton
This commit is contained in:
parent
9fda233897
commit
3e7d977886
|
@ -28,13 +28,6 @@ const char *BLT_translate_do_iface(const char *msgctxt, const char *msgid);
|
|||
const char *BLT_translate_do_tooltip(const char *msgctxt, const char *msgid);
|
||||
const char *BLT_translate_do_new_dataname(const char *msgctxt, const char *msgid);
|
||||
|
||||
/**
|
||||
* Note that "lang" here is the _output_ display language. We used to restrict
|
||||
* IME for keyboard _input_ language because our multilingual font was only used
|
||||
* when some output languages were selected. That font is used all the time now.
|
||||
*/
|
||||
bool BLT_lang_is_ime_supported(void);
|
||||
|
||||
/* The "translation-marker" macro. */
|
||||
#define N_(msgid) msgid
|
||||
#define CTX_N_(context, msgid) msgid
|
||||
|
|
|
@ -345,12 +345,3 @@ void BLT_lang_locale_explode(const char *locale,
|
|||
MEM_freeN(_t);
|
||||
}
|
||||
}
|
||||
|
||||
bool BLT_lang_is_ime_supported(void)
|
||||
{
|
||||
#ifdef WITH_INPUT_IME
|
||||
return true;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -3507,7 +3507,7 @@ static void ui_textedit_begin(bContext *C, uiBut *but, uiHandleButtonData *data)
|
|||
WM_cursor_modal_set(win, WM_CURSOR_TEXT_EDIT);
|
||||
|
||||
#ifdef WITH_INPUT_IME
|
||||
if (is_num_but == false && BLT_lang_is_ime_supported()) {
|
||||
if (!is_num_but) {
|
||||
ui_textedit_ime_begin(win, but);
|
||||
}
|
||||
#endif
|
||||
|
@ -3911,7 +3911,7 @@ static void ui_do_but_textedit(
|
|||
|
||||
if ((event->ascii || event->utf8_buf[0]) && (retval == WM_UI_HANDLER_CONTINUE)
|
||||
#ifdef WITH_INPUT_IME
|
||||
&& !is_ime_composing && (!WM_event_is_ime_switch(event) || !BLT_lang_is_ime_supported())
|
||||
&& !is_ime_composing && !WM_event_is_ime_switch(event)
|
||||
#endif
|
||||
) {
|
||||
char ascii = event->ascii;
|
||||
|
|
Loading…
Reference in New Issue