[Winmerge-svn] SF.net SVN: winmerge: [5049] trunk/Src/ChildFrm.cpp

[<ki...@us...>]

Revision: 5049
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5049&view=rev
Author:   kimmov
Date:     2008-02-18 09:58:35 -0800 (Mon, 18 Feb 2008)

Log Message:
-----------
Add own constant for file compare statusbar EOL indicator panel width.

Modified Paths:
--------------
    trunk/Src/ChildFrm.cpp

Modified: trunk/Src/ChildFrm.cpp
===================================================================
--- trunk/Src/ChildFrm.cpp	2008-02-18 14:11:50 UTC (rev 5048)
+++ trunk/Src/ChildFrm.cpp	2008-02-18 17:58:35 UTC (rev 5049)
@@ -48,6 +48,8 @@
 static UINT RO_PANEL_WIDTH = 40;
 /** @brief Encoding status panel width */
 static UINT ENCODING_PANEL_WIDTH = 80;
+/** @brief EOL type status panel width */
+static UINT EOL_PANEL_WIDTH = 40;
 
 /////////////////////////////////////////////////////////////////////////////
 // CChildFrame
@@ -101,6 +103,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // CChildFrame construction/destruction
 
+/**
+ * @brief Constructor.
+ */
 CChildFrame::CChildFrame()
 #pragma warning(disable:4355) // 'this' : used in base member initializer list
 : m_leftStatus(this, PANE_LEFT_INFO)
@@ -114,6 +119,9 @@
 	m_pMergeDoc = 0;
 }
 
+/**
+ * Destructor.
+ */
 CChildFrame::~CChildFrame()
 {
 	m_wndDetailBar.setSplitter(0);
@@ -362,7 +370,8 @@
 }
 
 /**
- * @brief Alternative LockWindowUpdate(hWnd) API. See the comment near the code that calls this function.
+ * @brief Alternative LockWindowUpdate(hWnd) API.
+ * See the comment near the code that calls this function.
  */
 static BOOL MyLockWindowUpdate(HWND hwnd)
 {
@@ -376,7 +385,8 @@
 }
 
 /**
- * @brief Alternative LockWindowUpdate(NULL) API. See the comment near the code that calls this function.
+ * @brief Alternative LockWindowUpdate(NULL) API.
+ * See the comment near the code that calls this function.
  */
 static BOOL MyUnlockWindowUpdate(HWND hwnd)
 {
@@ -566,12 +576,12 @@
 		// Set bottom statusbar panel widths
 		// Kimmo - I don't know why 4 seems to be right for me
 		int borderWidth = 4; // GetSystemMetrics(SM_CXEDGE);
-		int pane1Width = w - (2 * (RO_PANEL_WIDTH + borderWidth) +
-				ENCODING_PANEL_WIDTH + borderWidth);
+		int pane1Width = w - (RO_PANEL_WIDTH + EOL_PANEL_WIDTH +
+				ENCODING_PANEL_WIDTH + (3 * borderWidth));
 		if (pane1Width < borderWidth)
 			pane1Width = borderWidth;
-		int pane2Width = w1 - (2 * (RO_PANEL_WIDTH + borderWidth) +
-				ENCODING_PANEL_WIDTH + borderWidth);
+		int pane2Width = w1 - (RO_PANEL_WIDTH + EOL_PANEL_WIDTH +
+				ENCODING_PANEL_WIDTH + (3 * borderWidth));
 		if (pane2Width < borderWidth)
 			pane2Width = borderWidth;
 
@@ -582,7 +592,7 @@
 		m_wndStatusBar.SetPaneInfo(PANE_LEFT_ENCODING, ID_STATUS_LEFTFILE_ENCODING,
 			SBPS_NORMAL, ENCODING_PANEL_WIDTH - borderWidth);
 		m_wndStatusBar.SetPaneInfo(PANE_LEFT_EOL, ID_STATUS_LEFTFILE_EOL,
-			SBPS_NORMAL, RO_PANEL_WIDTH - borderWidth);
+			SBPS_NORMAL, EOL_PANEL_WIDTH - borderWidth);
 		m_wndStatusBar.SetPaneInfo(PANE_RIGHT_INFO, ID_STATUS_RIGHTFILE_INFO,
 			SBPS_STRETCH, pane2Width);
 		m_wndStatusBar.SetPaneInfo(PANE_RIGHT_RO, ID_STATUS_RIGHTFILE_RO,
@@ -590,7 +600,7 @@
 		m_wndStatusBar.SetPaneInfo(PANE_RIGHT_ENCODING, ID_STATUS_RIGHTFILE_ENCODING,
 			SBPS_NORMAL, ENCODING_PANEL_WIDTH - borderWidth);
 		m_wndStatusBar.SetPaneInfo(PANE_RIGHT_EOL, ID_STATUS_RIGHTFILE_EOL,
-			SBPS_NORMAL, RO_PANEL_WIDTH - borderWidth);
+			SBPS_NORMAL, EOL_PANEL_WIDTH - borderWidth);
 	}
 }
 


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