Fix Bitbucket issue WinMerge#140: Click doesn't trigger document to scroll in Location pane under circumstance

sdottaka · sdottaka · commit 97889a0e46c5 · 2019-01-30T19:11:12.000+09:00
diff --git a/Src/LocationView.cpp b/Src/LocationView.cpp
@@ -885,17 +885,15 @@ int CLocationView::GetLineFromYPos(int nYCoord, int bar, bool bRealLine /*= true
  */
 int CLocationView::IsInsideBar(const CRect& rc, const POINT& pt)
 {
-	int retVal = BAR_NONE;
 	CMergeDoc *pDoc = GetDocument();
 	for (int pane = 0; pane < pDoc->m_nBuffers; pane++)
 	{
 		if (m_bar[pane].PtInRect(pt))
-		{
-			retVal = BAR_0 + pane;
-			break;
-		}
+			return BAR_0 + pane;
 	}
-	return retVal;
+	if (pt.y > m_bar[0].top && pt.y <= m_bar[0].bottom)
+		return BAR_YAREA;
+	return BAR_NONE;
 }
 
 /** 

Original file line number	Diff line number	Diff line change
`@@ -885,17 +885,15 @@ int CLocationView::GetLineFromYPos(int nYCoord, int bar, bool bRealLine /*= true`
`885`	`885`	`*/`
`886`	`886`	`int CLocationView::IsInsideBar(const CRect& rc, const POINT& pt)`
`887`	`887`	`{`
`888`		`- int retVal = BAR_NONE;`
`889`	`888`	`CMergeDoc *pDoc = GetDocument();`
`890`	`889`	`for (int pane = 0; pane < pDoc->m_nBuffers; pane++)`
`891`	`890`	`{`
`892`	`891`	`if (m_bar[pane].PtInRect(pt))`
`893`		`- {`
`894`		`- retVal = BAR_0 + pane;`
`895`		`- break;`
`896`		`- }`
	`892`	`+ return BAR_0 + pane;`
`897`	`893`	`}`
`898`		`- return retVal;`
	`894`	`+ if (pt.y > m_bar[0].top && pt.y <= m_bar[0].bottom)`
	`895`	`+ return BAR_YAREA;`
	`896`	`+ return BAR_NONE;`
`899`	`897`	`}`
`900`	`898`
`901`	`899`	`/**`