[uim-commit] r1142 - trunk/xim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-08-06 07:04:34 -0700 (Sat, 06 Aug 2005)
New Revision: 1142

Modified:
   trunk/xim/convdisp.cpp
Log:
* xim/convdisp.cpp (ConvdispOv::update_icxatr) : Invoke
  move_candwin() with proper timing.
(ConvdispOv::update_caret_state) : Ditto.


Modified: trunk/xim/convdisp.cpp
===================================================================
--- trunk/xim/convdisp.cpp	2005-08-06 13:17:13 UTC (rev 1141)
+++ trunk/xim/convdisp.cpp	2005-08-06 14:04:34 UTC (rev 1142)
@@ -1052,6 +1052,7 @@
     if (focusedContext && focusedContext == mKkContext) {
 	move_candwin();
 	disp->update_caret_state();
+	m_atr->unset_change_mask(ICA_SpotLocation);
     }
 }
 
@@ -1138,7 +1139,6 @@
 	uim_bool  show_caret_state = uim_scm_symbol_value_bool("bridge-show-input-state?");
 	if (show_caret_state == UIM_TRUE)
 	    update_caret_state();
-	m_atr->unset_change_mask(ICA_SpotLocation);
     }
 
     if (!m_ov_win)
@@ -1176,6 +1176,10 @@
 	m_atr->unset_change_mask(ICA_FontSet);
     }
   
+    if (m_atr->is_changed(ICA_SpotLocation)) {
+	move_candwin();
+	m_atr->unset_change_mask(ICA_SpotLocation);
+    }
     draw_preedit();
 }