From d43f8cabdbe3a0a47b8bbea05c95f26bfaac0517 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 27 Sep 2018 16:49:30 +0800 Subject: enable emoji candidates --- src/PYPPhoneticEditor.cc | 6 ++++++ src/PYPPhoneticEditor.h | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/PYPPhoneticEditor.cc b/src/PYPPhoneticEditor.cc index 8b5324b..eaff323 100644 --- a/src/PYPPhoneticEditor.cc +++ b/src/PYPPhoneticEditor.cc @@ -37,6 +37,7 @@ PhoneticEditor::PhoneticEditor (PinyinProperties &props, m_lua_trigger_candidates (this), m_lua_converter_candidates (this), #endif + m_emoji_candidates (this), m_traditional_candidates (this) { } @@ -239,6 +240,8 @@ PhoneticEditor::updateCandidates (void) } #endif + m_emoji_candidates.processCandidates (m_candidates); + return TRUE; } @@ -372,6 +375,9 @@ PhoneticEditor::selectCandidateInternal (EnhancedCandidate & candidate) return m_lua_converter_candidates.selectCandidate (candidate); #endif + case CANDIDATE_EMOJI: + return m_emoji_candidates.selectCandidate (candidate); + default: assert (FALSE); } diff --git a/src/PYPPhoneticEditor.h b/src/PYPPhoneticEditor.h index 3a695b9..64750d7 100644 --- a/src/PYPPhoneticEditor.h +++ b/src/PYPPhoneticEditor.h @@ -36,6 +36,8 @@ #include "PYPLuaConverterCandidates.h" #endif +#include "PYPEmojiCandidates.h" + namespace PY { class PhoneticEditor : public Editor { @@ -116,6 +118,8 @@ protected: LuaConverterCandidates m_lua_converter_candidates; #endif + EmojiCandidates m_emoji_candidates; + TraditionalCandidates m_traditional_candidates; }; -- cgit