[Winmerge-svn] SF.net SVN: winmerge: [4535] trunk/Src/Common/SplitterWndEx.cpp
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2007-09-13 14:56:38
|
Revision: 4535 http://winmerge.svn.sourceforge.net/winmerge/?rev=4535&view=rev Author: kimmov Date: 2007-09-13 07:56:37 -0700 (Thu, 13 Sep 2007) Log Message: ----------- PATCH: [ 1788168 ] Better multi-monitor support Fix bug when fullscreen [ 1793135 ] submitted by highjinx at sourceforge.net Modified Paths: -------------- trunk/Src/Common/SplitterWndEx.cpp Modified: trunk/Src/Common/SplitterWndEx.cpp =================================================================== --- trunk/Src/Common/SplitterWndEx.cpp 2007-09-12 21:18:57 UTC (rev 4534) +++ trunk/Src/Common/SplitterWndEx.cpp 2007-09-13 14:56:37 UTC (rev 4535) @@ -218,6 +218,7 @@ HMONITOR hLeftMonitor = MonitorFromPoint(vSplitterWndRect.TopLeft(), MONITOR_DEFAULTTONEAREST); HMONITOR hRightMonitor = MonitorFromPoint(CPoint(vSplitterWndRect.right, vSplitterWndRect.top), MONITOR_DEFAULTTONEAREST); + bool bSplitPanesInHalf = true; if (hLeftMonitor != hRightMonitor) { MONITORINFO info; @@ -227,10 +228,15 @@ int iDesiredWidthOfLeftPane = info.rcMonitor.right - vSplitterWndRect.left; int iDesiredWidthOfRightPane = vSplitterWndRect.right - info.rcMonitor.right; - SetColumnInfo(0, iDesiredWidthOfLeftPane, 0); - SetColumnInfo(1, iDesiredWidthOfRightPane, 0); + if (iDesiredWidthOfLeftPane > 100 && iDesiredWidthOfRightPane > 100) + { + bSplitPanesInHalf = false; + SetColumnInfo(0, iDesiredWidthOfLeftPane, 0); + SetColumnInfo(1, iDesiredWidthOfRightPane, 0); + } } - else + + if (bSplitPanesInHalf) { CRect vSplitterWndRect; GetWindowRect(vSplitterWndRect); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |