[Winmerge-svn] SF.net SVN: winmerge: [3969] trunk/Src

[<ga...@us...>]

Revision: 3969
          http://svn.sourceforge.net/winmerge/?rev=3969&view=rev
Author:   galh
Date:     2006-12-16 22:43:34 -0800 (Sat, 16 Dec 2006)

Log Message:
-----------
BUG: [ 1614558 ] Goto line doesn't work when word wrap is enabled

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/MergeEditView.cpp

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-12-14 23:14:10 UTC (rev 3968)
+++ trunk/Src/Changes.txt	2006-12-17 06:43:34 UTC (rev 3969)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-12-17 Gal
+ BUG: [ 1614558 ] Goto line doesn't work when word wrap is enabled
+  Src: MergeEditView.cpp
+
 2006-12-14 Kimmo
  BUG: [ 1602219 ] Crappy save of project files
   Src: MainFrm.cpp ProjectFilePathsDlg.cpp

Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp	2006-12-14 23:14:10 UTC (rev 3968)
+++ trunk/Src/MergeEditView.cpp	2006-12-17 06:43:34 UTC (rev 3969)
@@ -2537,7 +2537,7 @@
 	ptPos.y = nApparentLine;
 
 	// Scroll line to center of view
-	int nScrollLine = nApparentLine;
+	int nScrollLine = GetSubLineIndex(nApparentLine);
 	nScrollLine -= GetScreenLines() / 2;
 	if (nScrollLine < 0)
 		nScrollLine = 0;


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