Attachment 18513 Details for Bug 17302 – Patch for Qt >=4.4.1

[patch] Patch for Qt >=4.4.1

subwin.diff (text/plain), 1.78 KB, created by Etsushi Kato on 2008-08-25 23:18:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Etsushi Kato

Created: 2008-08-25 23:18:37 UTC

Size: 1.78 KB

patch

obsolete

>Index: immodule/candidatewindow.cpp
>===================================================================
>--- immodule/candidatewindow.cpp	(revision 5530)
>+++ immodule/candidatewindow.cpp	(working copy)
>@@ -98,7 +98,7 @@
> 
>     isAlwaysLeft = false;
> 
>-    subWin = new SubWindow( 0 );
>+    subWin = NULL;
> }
> 
> CandidateWindow::~CandidateWindow()
>@@ -123,11 +123,15 @@
>     candidateIndex = -1;
>     displayLimit = dLimit;
>     pageIndex = 0;
>+
>+    if ( !subWin )
>+        subWin = new SubWindow( this );
> }
> 
> void CandidateWindow::deactivateCandwin()
> {
>-    subWin->cancelHook();
>+    if ( subWin )
>+        subWin->cancelHook();
> 
>     hide();
>     clearCandidates();
>@@ -378,14 +382,16 @@
> 
> void CandidateWindow::slotHookSubwindow( Q3ListViewItem * item )
> {
>-    // cancel previous hook
>-    subWin->cancelHook();
>+    if ( subWin ) {
>+        // cancel previous hook
>+        subWin->cancelHook();
> 
>-    // hook annotation
>-    QString annotationString = item->text( 2 );
>-    if ( !annotationString.isEmpty() )
>-    {
>-        subWin->hookPopup( "Annotation", annotationString );
>+        // hook annotation
>+        QString annotationString = item->text( 2 );
>+        if ( !annotationString.isEmpty() )
>+        {
>+            subWin->hookPopup( "Annotation", annotationString );
>+        }
>     }
> }
> 
>@@ -393,13 +399,15 @@
> void CandidateWindow::moveEvent( QMoveEvent *e )
> {
>     // move subwindow
>-    subWin->layoutWindow( e->pos().x() + width(), e->pos().y() );
>+    if ( subWin )
>+        subWin->layoutWindow( e->pos().x() + width(), e->pos().y() );
> }
> 
> void CandidateWindow::resizeEvent( QResizeEvent *e )
> {
>     // move subwindow
>-    subWin->layoutWindow( pos().x() + e->size().width(), pos().y() );
>+    if ( subWin )
>+        subWin->layoutWindow( pos().x() + e->size().width(), pos().y() );
> }
> 
>

Actions: View | Splinter Review

Attachments on bug 17302: 18513

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.