Fixed bug where MXP menu hotspot would be wrong if TextRectangle used

nickgammon · nickgammon · commit 481eb1d9868f · 2012-10-11T14:31:18.000+11:00
diff --git a/install/readme.txt b/install/readme.txt
@@ -1,7 +1,7 @@
 MUSHclient version 4.85
 =======================
 
-Sunday, 30th September 2012
+Thursday, 11th October 2012
 
 Author: Nick Gammon
 Web support: http://www.gammon.com.au/forum/
diff --git a/mushview.cpp b/mushview.cpp
@@ -3519,7 +3519,8 @@ ASSERT_VALID(pDoc);
                  pDoc->m_iPixelOffset + 
                  pLine->m_iPreambleOffset;
 
-    if (point.x < pixel &&
+    if ((point.x - pDoc->m_TextRectangle.left) < pixel &&
+        (point.x - pDoc->m_TextRectangle.left) >= 0 &&
         pDoc->FindStyle (pLine, col, iCol, pStyle, foundpos))
       {
       iStyle = pStyle->iFlags;

Original file line number	Diff line number	Diff line change
`@@ -3519,7 +3519,8 @@ ASSERT_VALID(pDoc);`
`3519`	`3519`	`pDoc->m_iPixelOffset +`
`3520`	`3520`	`pLine->m_iPreambleOffset;`
`3521`	`3521`
`3522`		`- if (point.x < pixel &&`
	`3522`	`+ if ((point.x - pDoc->m_TextRectangle.left) < pixel &&`
	`3523`	`+ (point.x - pDoc->m_TextRectangle.left) >= 0 &&`
`3523`	`3524`	`pDoc->FindStyle (pLine, col, iCol, pStyle, foundpos))`
`3524`	`3525`	`{`
`3525`	`3526`	`iStyle = pStyle->iFlags;`