Revision: 6392
Author: nogu.dev
Date: Sun May 23 07:54:44 2010
Log: * qt4/immodule/candidatewindow.cpp
- (CandidateWindow::activateCandwin): Don't hide annotation window
manually.
- (CandidateWindow::hideEvent): New function. Always hide
annotation window on hide of this window.
* qt4/immodule/candidatewindow.h
- Ditto.
http://code.google.com/p/uim/source/detail?r=6392
Modified:
/trunk/qt4/immodule/candidatewindow.cpp
/trunk/qt4/immodule/candidatewindow.h
=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp Sun May 23 03:47:16 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp Sun May 23 07:54:44 2010
@@ -129,9 +129,6 @@
void CandidateWindow::deactivateCandwin()
{
- if ( subWin )
- subWin->cancelHook();
-
hide();
clearCandidates();
}
@@ -589,6 +586,12 @@
subWin->layoutWindow( QRect( pos(), e->size() ) );
}
+void CandidateWindow::hideEvent( QHideEvent *event )
+{
+ QFrame::hideEvent( event );
+ if ( subWin )
+ subWin->cancelHook();
+}
QSize CandidateWindow::sizeHint() const
{
=======================================
--- /trunk/qt4/immodule/candidatewindow.h Wed Apr 28 18:24:41 2010
+++ /trunk/qt4/immodule/candidatewindow.h Sun May 23 07:54:44 2010
@@ -94,6 +94,7 @@
// Moving and Resizing affects the position of Subwindow
virtual void moveEvent( QMoveEvent * );
virtual void resizeEvent( QResizeEvent * );
+ virtual void hideEvent( QHideEvent *event );
bool eventFilter( QObject *obj, QEvent *event );
