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

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

Revision: 4731
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4731&view=rev
Author:   sdottaka
Date:     2007-11-10 17:03:15 -0800 (Sat, 10 Nov 2007)

Log Message:
-----------
BUG: [ 1829572 ] Visible area rect on location bar shakes

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

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2007-11-11 01:02:44 UTC (rev 4730)
+++ branches/R2_6/Src/Changes.txt	2007-11-11 01:03:15 UTC (rev 4731)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2007-11-11 Takashi
+ BUG: [ 1829572 ] Visible area rect on location bar shakes
+  Src: MergeEditView.cpp
+
 2007-11-05 Kimmo
  BUG: [ 1824734 ] "About..." box still has 2006 copyright. :-(
   Src: Merge.rc

Modified: branches/R2_6/Src/MergeEditView.cpp
===================================================================
--- branches/R2_6/Src/MergeEditView.cpp	2007-11-11 01:02:44 UTC (rev 4730)
+++ branches/R2_6/Src/MergeEditView.cpp	2007-11-11 01:03:15 UTC (rev 4731)
@@ -2575,61 +2575,18 @@
 {
 	CCrystalTextView::OnVScroll (nSBCode, nPos, pScrollBar);
  
+	if (nSBCode == SB_ENDSCROLL)
+		return;
+
 	// Note we cannot use nPos because of its 16-bit nature
 	SCROLLINFO si = {0};
 	si.cbSize = sizeof (si);
 	si.fMask = SIF_PAGE | SIF_POS | SIF_RANGE | SIF_TRACKPOS;
 	VERIFY (GetScrollInfo (SB_VERT, &si));
 
-	// Get the minimum and maximum scroll-bar	positions.
-	int nMinPos =	si.nMin;
-	int nMaxPos =	si.nMax;
-
 	// Get the current position of scroll	box.
 	int nCurPos =	si.nPos;
 
-	BOOL bDisableSmooth =	TRUE;
-	switch (nSBCode)
-	{
-	case SB_TOP:			// Scroll to top.
-		nCurPos = nMinPos;
-		bDisableSmooth = FALSE;
-		break;
-
-	case SB_BOTTOM:			// Scroll to bottom.
-		nCurPos =	nMaxPos;
-		bDisableSmooth = FALSE;
-		break;
-
-	case SB_LINEUP:			// Scroll one line up.
-		if (nCurPos >	nMinPos)
-			nCurPos--;
-		break;
-
-	case SB_LINEDOWN:		// Scroll one line down.
-		if (nCurPos <	nMaxPos)
-			nCurPos++;
-		break;
-
-	case SB_PAGEUP:			// Scroll one page up.
-		nCurPos =	max(nMinPos, nCurPos - (int) si.nPage +	1);
-		bDisableSmooth = FALSE;
-		break;
-
-	case SB_PAGEDOWN:		// Scroll one page down.
-		nCurPos =	min(nMaxPos, nCurPos + (int) si.nPage -	1);
-		bDisableSmooth = FALSE;
-		break;
-
-	case SB_THUMBPOSITION:		// Scroll to absolute position.	nPos is	the	position
-		nCurPos =	si.nTrackPos;	// of the scroll box at	the	end	of the drag	operation.
-		break;
-
-	case SB_THUMBTRACK:			// Drag	scroll box to specified	position. nPos is the
-		nCurPos =	si.nTrackPos;	// position	that the scroll	box	has	been dragged to.
-		break;
-	}
-
 	UpdateLocationViewPosition(nCurPos);
 }
 


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