PATCH: [ 1175065 ] Use view lines when scrolling from location pane

diff --git a/Src/LocationView.cpp b/Src/LocationView.cpp
index 266ee3c..61d7b67 100644 (file)
--- a/Src/LocationView.cpp
+++ b/Src/LocationView.cpp
@@ -36,7 +36,7 @@ static const double MAX_LINEPIX = 4.0;
 /** 
  * @brief Bars in location pane
  */
-enum
+enum LOCBAR_TYPE
 {
        BAR_NONE = 0,   /**< No bar in given coords */
        BAR_LEFT,               /**< Left side bar in given coords */
@@ -351,12 +351,25 @@ void CLocationView::DrawRect(CDC* pDC, const CRect& r, COLORREF cr, BOOL border)
 /// User pushed left mousebutton
 void CLocationView::OnLButtonDown(UINT nFlags, CPoint point) 
 {
-       if (!GotoLocation(point))
+       if (!GotoLocation(point, FALSE))
                CView::OnLButtonDown(nFlags, point);
 }
 
-/// Move both views to point given (if in one of the file columns, else return FALSE)
-BOOL CLocationView::GotoLocation(CPoint point)
+/**
+ * @brief Scroll both views to point given.
+ *
+ * Scroll views to given line. There is two ways to scroll, based on
+ * view lines (ghost lines counted in) or on real lines (no ghost lines).
+ * In most cases view lines should be used as it avoids real line number
+ * calculation and is able to scroll to all lines - real line numbers
+ * cannot be used to scroll to ghost lines.
+ *
+ * @param [in] point Point to move to
+ * @param [in] bRealLine TRUE if we want to scroll using real line num,
+ * FALSE if view linenumbers are OK.
+ * @return TRUE if succeeds, FALSE if point not inside bars.
+ */
+BOOL CLocationView::GotoLocation(CPoint point, BOOL bRealLine)
 {
        CRect rc;
        GetClientRect(rc);
@@ -369,12 +382,12 @@ BOOL CLocationView::GotoLocation(CPoint point)
        int bar = IsInsideBar(rc, point);
        if (bar == BAR_LEFT || bar == BAR_RIGHT)
        {
-               line = GetLineFromYPos(point.y, rc, bar);
+               line = GetLineFromYPos(point.y, rc, bar, bRealLine);
        }
        else
                return FALSE;
 
-       m_view0->GotoLine(line, TRUE, bar == BAR_LEFT);
+       m_view0->GotoLine(line, bRealLine, bar == BAR_LEFT);
        if (bar == BAR_LEFT)
                m_view0->SetFocus();
        else
@@ -479,13 +492,15 @@ void CLocationView::OnContextMenu(CWnd* pWnd, CPoint point)
 }
 
 /** 
- * @brief Calculates real line in file from given YCoord in bar.
+ * @brief Calculates view/real line in file from given YCoord in bar.
  * @param [in] nYCoord ycoord in pane
  * @param [in] rc size of locationpane
  * @param [in] bar bar/file
- * @return 0-based index of real line in file [0...lines-1]
+ * @param [in] bRealLine TRUE if real line is returned, FALSE for view line
+ * @return 0-based index of view/real line in file [0...lines-1]
  */
-int CLocationView::GetLineFromYPos(int nYCoord, CRect rc, int bar)
+int CLocationView::GetLineFromYPos(int nYCoord, CRect rc, int bar,
+       BOOL bRealLine)
 {
        CMergeDoc* pDoc = GetDocument();
        const int nbLines = min(m_view0->GetLineCount(), m_view1->GetLineCount());
@@ -493,9 +508,16 @@ int CLocationView::GetLineFromYPos(int nYCoord, CRect rc, int bar)
        int nRealLine = -1;
 
        line--; // Convert linenumber to lineindex
-       if (line > nbLines - 1) // Just to be sure
+       if (line < 0)
+               line = 0;
+       if (line > (nbLines - 1))
                line = nbLines - 1;
 
+       // We've got a view line now
+       if (bRealLine == FALSE)
+               return line;
+
+       // Get real line (exclude ghost lines)
        if (bar == BAR_LEFT)
        {
                nRealLine = pDoc->m_ltBuf.ComputeRealLine(line);
@@ -554,7 +576,7 @@ void CLocationView::DrawVisibleAreaRect(int nTopLine, int nBottomLine)
                nTopLine = pDoc->GetRightView()->GetTopLine();
        
        if (nBottomLine == -1)
-               nBottomLine = nTopLine + nScreenLines;;
+               nBottomLine = nTopLine + nScreenLines;
 
        CRect rc;
        GetClientRect(rc);

diff --git a/Src/LocationView.h b/Src/LocationView.h
index 97c33c2..b4545cb 100644 (file)
--- a/Src/LocationView.h
+++ b/Src/LocationView.h
@@ -59,8 +59,8 @@ protected:
        // Return end of block (diff/non-diff)
        BOOL GetNextRect(int &nLineIndex);
        void DrawRect(CDC* pDC, const CRect& r, COLORREF cr, BOOL border = FALSE);
-       BOOL GotoLocation(CPoint point);
-       int GetLineFromYPos(int nYCoord, CRect rc, int bar);
+       BOOL GotoLocation(CPoint point, BOOL bRealLine = TRUE);
+       int GetLineFromYPos(int nYCoord, CRect rc, int bar, BOOL bRealLine = TRUE);
        int IsInsideBar(CRect rc, POINT pt);
        void DrawVisibleAreaRect(int nTopLine = -1, int nBottomLine = -1);
        void DrawConnectLines();

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 07ea540..a7da62b 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -1701,7 +1701,7 @@ OnUpdateCaret()
                if (m_pLocationView)
                {
                        m_pLocationView->UpdateVisiblePos(m_nTopLine,
-                               m_nTopLine + GetScreenChars());
+                               m_nTopLine + GetScreenLines());
                }
        }
 }
@@ -2352,7 +2352,7 @@ void CMergeEditView::GotoLine(UINT nLine, BOOL bRealLine, BOOL bLeft)
        CMergeEditView *pLeftView = pDoc->GetLeftView();
        CMergeEditView *pRightView = pDoc->GetRightView();
        int nRealLine = nLine;
-       int nApparentLine = 0;
+       int nApparentLine = nLine;
        int nLineCount = 0;
 
        // Compute apparent (shown linenumber) line

diff --git a/Src/readme.txt b/Src/readme.txt
index eb0d9c5..6606a0a 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2005-04-02 Kimmo
+ PATCH: [ 1175065 ] Use view lines when scrolling from location pane
+  Src: LocationView.cpp LocationView.h MergeEditView.cpp
+
 2005-04-01 Kimmo
  PATCH: [ 1174935 ] Russian translation update
   Submitted by Dmitriy Aleshkowskiy