From e361ed422efb606e7da2f72a068c7730107d7163 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Wed, 29 Jun 2016 10:18:33 +0800 Subject: use pinyin_get_character_offset function --- src/PYPBopomofoEditor.cc | 6 ++++-- src/PYPPinyinEditor.cc | 8 ++++++-- src/PYPPinyinEditor.h | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/PYPBopomofoEditor.cc b/src/PYPBopomofoEditor.cc index 11c4ffd..c11b586 100644 --- a/src/PYPBopomofoEditor.cc +++ b/src/PYPBopomofoEditor.cc @@ -330,8 +330,10 @@ BopomofoEditor::updatePreeditText () /* underline */ preedit_text.appendAttribute (IBUS_ATTR_TYPE_UNDERLINE, IBUS_ATTR_UNDERLINE_SINGLE, 0, -1); - guint pinyin_cursor = getPinyinCursor (); - Editor::updatePreeditText (preedit_text, pinyin_cursor, TRUE); + size_t offset = 0; + guint cursor = getPinyinCursor (); + pinyin_get_character_offset(m_instance, cursor, &offset); + Editor::updatePreeditText (preedit_text, offset, TRUE); } void diff --git a/src/PYPPinyinEditor.cc b/src/PYPPinyinEditor.cc index dad61e0..2e614f2 100644 --- a/src/PYPPinyinEditor.cc +++ b/src/PYPPinyinEditor.cc @@ -266,10 +266,13 @@ PinyinEditor::updatePreeditText () /* underline */ preedit_text.appendAttribute (IBUS_ATTR_TYPE_UNDERLINE, IBUS_ATTR_UNDERLINE_SINGLE, 0, -1); - guint pinyin_cursor = getPinyinCursor (); - Editor::updatePreeditText (preedit_text, pinyin_cursor, TRUE); + size_t offset = 0; + guint cursor = getPinyinCursor (); + pinyin_get_character_offset(m_instance, cursor, &offset); + Editor::updatePreeditText (preedit_text, offset, TRUE); } +#if 0 void PinyinEditor::updateAuxiliaryText () { @@ -306,6 +309,7 @@ PinyinEditor::updateAuxiliaryText () StaticText aux_text (m_buffer); Editor::updateAuxiliaryText (aux_text, TRUE); } +#endif void PinyinEditor::updateLookupTable () diff --git a/src/PYPPinyinEditor.h b/src/PYPPinyinEditor.h index de410de..30dff69 100644 --- a/src/PYPPinyinEditor.h +++ b/src/PYPPinyinEditor.h @@ -42,7 +42,7 @@ protected: void commit (); - virtual void updateAuxiliaryText (void); + virtual void updateAuxiliaryText (void) = 0; virtual void updateLookupTable (void); virtual void updatePreeditText (void); -- cgit