|
From: <ki...@us...> - 2008-05-14 22:47:40
|
Revision: 5341
http://winmerge.svn.sourceforge.net/winmerge/?rev=5341&view=rev
Author: kimmov
Date: 2008-05-14 15:47:37 -0700 (Wed, 14 May 2008)
Log Message:
-----------
Refactor LocationView to use two CRects for storing bar coordinates (instead of four integers).
Modified Paths:
--------------
trunk/Src/LocationView.cpp
trunk/Src/LocationView.h
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2008-05-06 22:17:34 UTC (rev 5340)
+++ trunk/Src/LocationView.cpp 2008-05-14 22:47:37 UTC (rev 5341)
@@ -223,10 +223,10 @@
CMergeDoc *pDoc = GetDocument();
const int w = rc.Width() / 4;
- m_nLeftBarLeft = (rc.Width() - 2 * w) / 3;
- m_nLeftBarRight = m_nLeftBarLeft + w;
- m_nRightBarLeft = 2 * m_nLeftBarLeft + w;
- m_nRightBarRight = m_nRightBarLeft + w;
+ m_leftBar.left = (rc.Width() - 2 * w) / 3;
+ m_leftBar.right = m_leftBar.left + w;
+ m_rightBar.left = 2 * m_leftBar.left + w;
+ m_rightBar.right = m_rightBar.left + w;
const double hTotal = rc.Height() - (2 * Y_OFFSET); // Height of draw area
const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetSubLineCount(),
m_view[MERGE_VIEW_RIGHT]->GetSubLineCount());
@@ -251,9 +251,12 @@
// Draw bar outlines
CPen* oldObj = (CPen*)pDC->SelectStockObject(BLACK_PEN);
- const int nBottom = (int)(LineInPix * nbLines + Y_OFFSET + 1);
- pDC->Rectangle(m_nLeftBarLeft, Y_OFFSET - 1, m_nLeftBarRight, nBottom);
- pDC->Rectangle(m_nRightBarLeft, Y_OFFSET - 1, m_nRightBarRight, nBottom);
+ m_leftBar.top = Y_OFFSET - 1;
+ m_rightBar.top = Y_OFFSET - 1;
+ m_leftBar.bottom = (LONG)(LineInPix * nbLines + Y_OFFSET + 1);
+ m_rightBar.bottom = m_leftBar.bottom;
+ pDC->Rectangle(m_leftBar);
+ pDC->Rectangle(m_rightBar);
pDC->SelectObject(oldObj);
// Iterate the differences list and draw differences as colored blocks.
@@ -293,12 +296,12 @@
{
// Draw left side block
m_view[MERGE_VIEW_LEFT]->GetLineColors2(diff.dbegin0, ignoreFlags, cr0, crt, bwh);
- CRect r0(m_nLeftBarLeft, nBeginY, m_nLeftBarRight, nEndY);
+ CRect r0(m_leftBar.left, nBeginY, m_leftBar.right, nEndY);
DrawRect(pDC, r0, cr0, bInsideDiff);
// Draw right side block
m_view[MERGE_VIEW_RIGHT]->GetLineColors2(diff.dbegin0, ignoreFlags, cr1, crt, bwh);
- CRect r1(m_nRightBarLeft, nBeginY, m_nRightBarRight, nEndY);
+ CRect r1(m_rightBar.left, nBeginY, m_rightBar.right, nEndY);
DrawRect(pDC, r1, cr1, bInsideDiff);
}
nPrevEndY = nEndY;
@@ -338,11 +341,11 @@
apparent0 = pView->GetSubLineIndex(apparent0);
apparent1 = pView->GetSubLineIndex(apparent1);
- start.x = m_nLeftBarRight;
+ start.x = m_leftBar.right;
int leftUpper = (int) (apparent0 * LineInPix + Y_OFFSET);
int leftLower = (int) ((nBlockHeight + apparent0) * LineInPix + Y_OFFSET);
start.y = leftUpper + (leftLower - leftUpper) / 2;
- end.x = m_nRightBarLeft;
+ end.x = m_rightBar.left;
int rightUpper = (int) (apparent1 * LineInPix + Y_OFFSET);
int rightLower = (int) ((nBlockHeight + apparent1) * LineInPix + Y_OFFSET);
end.y = rightUpper + (rightLower - rightUpper) / 2;
@@ -365,11 +368,11 @@
apparent0 = pView->GetSubLineIndex(apparent0);
apparent1 = pView->GetSubLineIndex(apparent1);
- start.x = m_nLeftBarRight;
+ start.x = m_leftBar.right;
int leftUpper = (int) (apparent0 * LineInPix + Y_OFFSET);
int leftLower = (int) ((nBlockHeight + apparent0) * LineInPix + Y_OFFSET);
start.y = leftUpper + (leftLower - leftUpper) / 2;
- end.x = m_nRightBarLeft;
+ end.x = m_rightBar.left;
int rightUpper = (int) (apparent1 * LineInPix + Y_OFFSET);
int rightLower = (int) ((nBlockHeight + apparent1) * LineInPix + Y_OFFSET);
end.y = rightUpper + (rightLower - rightUpper) / 2;
@@ -895,11 +898,11 @@
void CLocationView::DrawDiffMarker(CDC* pDC, int yCoord)
{
CPoint points[3];
- points[0].x = m_nLeftBarLeft - DIFFMARKER_WIDTH - 1;
+ points[0].x = m_leftBar.left - DIFFMARKER_WIDTH - 1;
points[0].y = yCoord - DIFFMARKER_TOP;
- points[1].x = m_nLeftBarLeft - 1;
+ points[1].x = m_leftBar.left - 1;
points[1].y = yCoord;
- points[2].x = m_nLeftBarLeft - DIFFMARKER_WIDTH - 1;
+ points[2].x = m_leftBar.left - DIFFMARKER_WIDTH - 1;
points[2].y = yCoord + DIFFMARKER_BOTTOM;
CPen* oldObj = (CPen*)pDC->SelectStockObject(BLACK_PEN);
@@ -909,9 +912,9 @@
pDC->SetPolyFillMode(WINDING);
pDC->Polygon(points, 3);
- points[0].x = m_nRightBarRight + 1 + DIFFMARKER_WIDTH;
- points[1].x = m_nRightBarRight + 1;
- points[2].x = m_nRightBarRight + 1 + DIFFMARKER_WIDTH;
+ points[0].x = m_rightBar.right + 1 + DIFFMARKER_WIDTH;
+ points[1].x = m_rightBar.right + 1;
+ points[2].x = m_rightBar.right + 1 + DIFFMARKER_WIDTH;
pDC->Polygon(points, 3);
pDC->SelectObject(pOldBrush);
Modified: trunk/Src/LocationView.h
===================================================================
--- trunk/Src/LocationView.h 2008-05-06 22:17:34 UTC (rev 5340)
+++ trunk/Src/LocationView.h 2008-05-14 22:47:37 UTC (rev 5341)
@@ -69,10 +69,8 @@
CMergeEditView* m_view[MERGE_VIEW_COUNT]; //*< Table for view pointers */
int m_displayMovedBlocks; //*< Setting for displaying moved blocks */
double m_pixInLines; //*< How many pixels is one line in bars */
- UINT m_nLeftBarLeft; //*< Left edge of left-side bar */
- UINT m_nLeftBarRight; //*< Right edge of left-side bar */
- UINT m_nRightBarLeft; //*< Left edge of right-side bar */
- UINT m_nRightBarRight; //*< Right edge of right-side bar */
+ CRect m_leftBar; //*< Left-side file's bar.
+ CRect m_rightBar; //*< Right-side file's bar.
int m_visibleTop; //*< Top visible line for visible area indicator */
int m_visibleBottom; //*< Bottom visible line for visible area indicator */
MOVEDLINE_LIST m_movedLines; //*< List of moved block connecting lines */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
