uim
Fork

Commit

* Merge r3562:3565 from trunk.

--- a/qt/immodule-quiminputcontext_with_slave.cpp

+++ b/qt/immodule-quiminputcontext_with_slave.cpp

		@@ -91,12 +91,23 @@ void QUimInputContextWithSlave::setHolderWidget( QWidget *w )
91	91
92	92	bool QUimInputContextWithSlave::filterEvent( const QEvent *event )
93	93	{
	94	+#if 0
94	95	// when isComposing==false, event is forwarded to slave ic
95	96	if ( ! isComposing() && slave && slave->filterEvent( event ) )
96	97	return true;
97	98
98	99	// else, event is dealt with uim-qt
99	100	return QUimInputContext::filterEvent( event );
	101	+#else
	102	+ if ( ! QUimInputContext::filterEvent( event ) ) {
	103	+ if ( ! isComposing() && slave && slave->filterEvent( event ) )
	104	+ return true;
	105	+ else
	106	+ return false;
	107	+ }
	108	+
	109	+ return true;
	110	+#endif
100	111	}
101	112
102	113	void QUimInputContextWithSlave::destroyInputContext()