[Winmerge-svn] SF.net SVN: winmerge: [4552] branches/R2_6/Src

[<sdo...@us...>]

Revision: 4552
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4552&view=rev
Author:   sdottaka
Date:     2007-09-17 11:04:33 -0700 (Mon, 17 Sep 2007)

Log Message:
-----------
BUG: [ 1795814 ] When word wrap+scroll to first are on, it fails to scroll

Modified Paths:
--------------
    branches/R2_6/Src/Changes.txt
    branches/R2_6/Src/MergeDoc.cpp

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2007-09-17 17:30:04 UTC (rev 4551)
+++ branches/R2_6/Src/Changes.txt	2007-09-17 18:04:33 UTC (rev 4552)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2007-09-17 Takashi
+ BUG: [ 1795814 ] When word wrap+scroll to first are on, it fails to scroll
+  Src: MergeDoc.cpp
+
 2007-09-15 Kimmo
  BUG: [ 1777054 ] Next difference sometimes not seen with Wrap Lines enabled
   Src: MergeEditView.cpp MergeEditView.h

Modified: branches/R2_6/Src/MergeDoc.cpp
===================================================================
--- branches/R2_6/Src/MergeDoc.cpp	2007-09-17 17:30:04 UTC (rev 4551)
+++ branches/R2_6/Src/MergeDoc.cpp	2007-09-17 18:04:33 UTC (rev 4552)
@@ -2869,14 +2869,6 @@
 			}
 		}
 
-		// scroll to first diff
-		if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST) &&
-			m_diffList.HasSignificantDiffs())
-		{
-			int nDiff = m_diffList.FirstSignificantDiff();
-			pLeft->SelectDiff(nDiff, TRUE, FALSE);
-		}
-
 		// set the frame window header
 		UpdateHeaderPath(0);
 		UpdateHeaderPath(1);
@@ -2897,6 +2889,14 @@
 			ShowRescanError(nRescanResult, bBinary, bIdentical);
 		}
 
+		// scroll to first diff
+		if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST) &&
+			m_diffList.HasSignificantDiffs())
+		{
+			int nDiff = m_diffList.FirstSignificantDiff();
+			pLeft->SelectDiff(nDiff, TRUE, FALSE);
+		}
+
 		// Exit if files are identical should only work for the first
 		// comparison and must be disabled afterward.
 		GetMainFrame()->m_bExitIfNoDiff = FALSE;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.