[Winmerge-svn] SF.net SVN: winmerge:[6314] branches/R2_12
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2009-01-11 20:21:16
|
Revision: 6314 http://winmerge.svn.sourceforge.net/winmerge/?rev=6314&view=rev Author: kimmov Date: 2009-01-11 20:21:06 +0000 (Sun, 11 Jan 2009) Log Message: ----------- PATCH: [ 2479804 ] Locationview Submitted by Matthias Mayer Commit the part improving visible area location in location pane. Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/LocationView.cpp Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-11 19:13:25 UTC (rev 6313) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-11 20:21:06 UTC (rev 6314) @@ -5,6 +5,7 @@ WinMerge 2.11.1.9 Update Python syntax highlight keywords for Python 2.6 (#2473375) + More accurate visible area rect in location pane (#2479804) Bugfix: Could not open project file that contains an ampersand character in folder names (#2372000) Bugfix: File compare method "Modified Date and Size" ignored file size Modified: branches/R2_12/Src/LocationView.cpp =================================================================== --- branches/R2_12/Src/LocationView.cpp 2009-01-11 19:13:25 UTC (rev 6313) +++ branches/R2_12/Src/LocationView.cpp 2009-01-11 20:21:06 UTC (rev 6314) @@ -919,7 +919,16 @@ if (nTopCoord < Y_OFFSET + 20) nBottomCoord += INDICATOR_MIN_HEIGHT - (nBottomCoord - nTopCoord); else - nTopCoord -= INDICATOR_MIN_HEIGHT - (nBottomCoord - nTopCoord); + { + // Make sure locationbox has min hight + if ((nBottomCoord - nTopCoord) < INDICATOR_MIN_HEIGHT) + { + int iPos = (INDICATOR_MIN_HEIGHT - (nBottomCoord - nTopCoord) )/2; + nTopCoord -= iPos; + nBottomCoord +=iPos; + } + } + } // Store current values for later use (to check if area changes) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |