From 9ba5e84fc961952c24ac0b752eeb40064d4cd18f Mon Sep 17 00:00:00 2001
From: Espen Sand <espen@kde.org>
Date: Thu, 18 May 2000 16:54:15 +0000
Subject: [PATCH] Made the timer that delays the resize operation a part of the
 class. As expected the problem was that is was static. Switching between
 layouts and opening a single popup message window now works when the timer is
 running.

svn path=/trunk/kdenetwork/kmail/; revision=49906
---
 kmreaderwin.cpp | 61 +++++++++++--------------------------------------
 kmreaderwin.h   |  1 +
 2 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/kmreaderwin.cpp b/kmreaderwin.cpp
index 493fb021e..1bdc94479 100644
--- a/kmreaderwin.cpp
+++ b/kmreaderwin.cpp
@@ -84,9 +84,15 @@ KMReaderWin::KMReaderWin(QWidget *aParent, const char *aName, int aFlags)
   readConfig();
   mHtmlOverride = false;
 
-  if (mAttachDir.isNull()) makeAttachDir();
-  connect(&updateReaderWinTimer, SIGNAL(timeout()),
-  	  this,SLOT(updateReaderWin()));
+  if (mAttachDir.isNull())
+  {
+    makeAttachDir();
+  }
+
+  connect( &updateReaderWinTimer, SIGNAL(timeout()),
+  	   this, SLOT(updateReaderWin()) );
+  connect( &mResizeTimer, SIGNAL(timeout()), 
+	   this, SLOT(slotDelayedResize()) );
 }
 
 
@@ -1030,56 +1036,20 @@ int KMReaderWin::msgPartFromUrl(const KURL &aUrl)
 }
 
 
-static bool doDelayedResize=false;
-
 //-----------------------------------------------------------------------------
 void KMReaderWin::resizeEvent(QResizeEvent *)
 {
   #warning Espen 2000-05-07. Using a delayed resize. Use direct resize
-  #warning from time to time to see how the html widget behaves.
+  #warning from time to time to see how the html widget and kwin behave.
 
-  #if 0
-  static QTimer *timer = 0;
-  if( timer == 0 )
-  {
-    timer = new QTimer( this );
-    connect( timer, SIGNAL(timeout()), SLOT(slotDelayedResize()) );
-  }
-  if( timer->isActive() )
+  if( !mResizeTimer.isActive() )
   {
     //
     // Combine all resize operations that are requested as long a 
     // the timer runs.
     //
-    //puts("delayed");
-    doDelayedResize = true;
-    return;
-  }
-  
-  //
-  // Resize now, and start the timer which will cause any new resize
-  // operations to be igored as long as the timer is active
-  //
-  mViewer->widget()->setGeometry(0, 0, width(), height());
-  doDelayedResize = false;
-  timer->start( 150, true );
-  #endif
-
-
-  static QTimer *timer = 0;
-  if( timer == 0 )
-  {
-    timer = new QTimer( this );
-    connect( timer, SIGNAL(timeout()), SLOT(slotDelayedResize()) );
+    mResizeTimer.start( 100, true );
   }
-  if( timer->isActive() )
-  {
-    //puts("ignored");
-    return;
-  }
-
-  doDelayedResize = true;
-  timer->start( 100, true );
 
   //
   // Orig
@@ -1090,12 +1060,7 @@ void KMReaderWin::resizeEvent(QResizeEvent *)
 
 void KMReaderWin::slotDelayedResize()
 {
-  if( doDelayedResize )
-  {
-    mViewer->widget()->setGeometry(0, 0, width(), height());
-    doDelayedResize = false;
-  }
-  //puts("DONE");
+  mViewer->widget()->setGeometry(0, 0, width(), height());
 }
 
 
diff --git a/kmreaderwin.h b/kmreaderwin.h
index 7130bb440..9cbaad4f7 100644
--- a/kmreaderwin.h
+++ b/kmreaderwin.h
@@ -207,6 +207,7 @@ protected:
   bool mBackingPixmapOn;
   QString mBackingPixmapStr;
   QTimer updateReaderWinTimer;
+  QTimer mResizeTimer;
 
   int fntSize;
   QString mBodyFamily;