From kde-commits  Thu Apr 28 20:18:44 2005
From: Mario Teijeiro Otero <emeteo () escomposlinux ! org>
Date: Thu, 28 Apr 2005 20:18:44 +0000
To: kde-commits
Subject: kdepim/kmail
Message-Id: <20050428201844.30EBB629 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=111471953613581

CVS commit by mteijeiro: 

* Hide correctly for this type of quoted mail:
  xxxxxxxx
  >>> yyyyy
  >> zzzz
  xxxxx

* Try remember the scrollview position when the collape/expand is done.


  M +3 -0      kmreaderwin.cpp   1.806
  M +2 -2      objecttreeparser.cpp   1.133


--- kdepim/kmail/objecttreeparser.cpp  #1.132:1.133
@@ -2529,6 +2529,6 @@ QString ObjectTreeParser::quotedHTML( co
           }
           else
-            //only show the QuoteMark when is the first level hidden
-            if ( mReader->mLevelQuote == actQuoteLevel && currQuoteLevel < actQuoteLevel ) 
+            //only show the QuoteMark when is the first line of the level hidden
+            if ( !curHidden ) 
             {
               //Expand all quotes

--- kdepim/kmail/kmreaderwin.cpp  #1.805:1.806
@@ -733,4 +733,7 @@ void KMReaderWin::slotLevelQuote( int l 
   kdDebug( 5006 ) << "Old Level: " << mLevelQuote << " New Level: " << l << endl;
         mLevelQuote = l;
+  QScrollView * scrollview = static_cast<QScrollView *>(mViewer->widget());
+  mSavedRelativePosition = (float)scrollview->contentsY() / scrollview->contentsHeight();
+
   update(true);
 }