pinyin/segmentor.h: fix comparision operator

[platform/core/uifw/ise-engine-sunpinyin.git] / src / ime-core / imi_view_classic.cpp

diff --git a/src/ime-core/imi_view_classic.cpp b/src/ime-core/imi_view_classic.cpp
index 37034bb..db2f021 100644 (file)
--- a/src/ime-core/imi_view_classic.cpp
+++ b/src/ime-core/imi_view_classic.cpp
@@ -90,7 +90,6 @@ CIMIClassicView::updateWindows(unsigned mask)
         m_uiPreeditString.clear();
         getPreeditString(m_uiPreeditString);
         // m_pWinHandler->updatePreedit(&ps);
-        handlerUpdatePreedit(&m_uiPreeditString);
     }
 
     if ((mask & PREEDIT_MASK) || (mask & CANDIDATE_MASK)) {
@@ -142,6 +141,10 @@ CIMIClassicView::updateWindows(unsigned mask)
         // m_pWinHandler->updateCandidates(&cl);
         handlerUpdateCandidates(&m_uiPreeditString, &m_uiCandidateList);
     }
+
+    if (mask & PREEDIT_MASK) {
+        handlerUpdatePreedit(&m_uiPreeditString);
+    }
 }
 
 bool
@@ -194,8 +197,11 @@ CIMIClassicView::onKeyEvent(const CKeyEvent& key)
                && !m_pIC->isEmpty()) {
         changeMasks |= KEYEVENT_USED;
         if (m_candiPageFirst > 0) {
-            m_candiPageFirst -= m_candiWindowSize;
-            if (m_candiPageFirst < 0) m_candiPageFirst = 0;
+            if (m_candiPageFirst > m_candiWindowSize) {
+                m_candiPageFirst -= m_candiWindowSize;
+            } else {
+                m_candiPageFirst = 0;
+            }
             changeMasks |= CANDIDATE_MASK;
         }
     } else if (((modifiers == 0 && keycode == IM_VK_PAGE_DOWN)