Thread: [Winmerge-svn] SF.net SVN: winmerge:[7520] branches/R2_14/Src/HexMergeDoc.cpp
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <jt...@us...> - 2011-03-28 21:48:21
|
Revision: 7520 http://winmerge.svn.sourceforge.net/winmerge/?rev=7520&view=rev Author: jtuc Date: 2011-03-28 21:48:15 +0000 (Mon, 28 Mar 2011) Log Message: ----------- Scroll ranges of left and right pane were not always properly aligned. Modified Paths: -------------- branches/R2_14/Src/HexMergeDoc.cpp Modified: branches/R2_14/Src/HexMergeDoc.cpp =================================================================== --- branches/R2_14/Src/HexMergeDoc.cpp 2011-03-28 21:46:32 UTC (rev 7519) +++ branches/R2_14/Src/HexMergeDoc.cpp 2011-03-28 21:48:15 UTC (rev 7520) @@ -446,7 +446,9 @@ SUCCEEDED(hr = LoadOneFile(MERGE_VIEW_RIGHT, pathRight, bRORight))) { UpdateDiffItem(0); - pf->Invalidate(); + // An extra ResizeWindow() on the left view aligns scroll ranges, and + // also triggers initial diff coloring by invalidating the client area. + m_pView[MERGE_VIEW_LEFT]->ResizeWindow(); if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST)) m_pView[MERGE_VIEW_LEFT]->SendMessage(WM_COMMAND, ID_FIRSTDIFF); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |