Map editor stops highlighting cursor when you scroll off editable map area

2 files changed, 23 insertions, 0 deletions

@@ -14,6 +14,7 @@ BEGIN_EVENT_TABLE(MapeditWidget, wxScrolledCanvas)
   EVT_LEFT_UP(MapeditWidget::OnMouseUp)
   EVT_MOTION(MapeditWidget::OnMouseMove)
   EVT_LEAVE_WINDOW(MapeditWidget::OnMouseOut)
+  EVT_SCROLLWIN(MapeditWidget::OnScroll)
 END_EVENT_TABLE()
 
 MapeditWidget::MapeditWidget()
@@ -565,3 +566,24 @@ void MapeditWidget::RenderMap(Map* toRender, wxPaintDC& dc, wxMemoryDC& tiles_dc
     }
   }
 }
+
+void MapeditWidget::OnScroll(wxScrollWinEvent&)
+{
+  int vX, vY, vW, vH;
+  GetViewStart(&vX, &vY);
+  GetVirtualSize(&vW, &vH);
+  int vXX, vYX;
+  GetScrollPixelsPerUnit(&vXX, &vYX);
+  vX *= vXX;
+  vY *= vYX;
+  
+  if ((mousePos.x+vX >= EDITOR_SPACING_X*scale) && (mousePos.x+vX < (EDITOR_WIDTH-EDITOR_SPACING_X)*scale)
+    && (mousePos.y+vY >= EDITOR_SPACING_Y*scale) && (mousePos.y+vY < (EDITOR_HEIGHT-EDITOR_SPACING_Y)*scale))
+  {
+    mouseIsIn = true;
+  } else {
+    mouseIsIn = false;
+  }
+  
+  Refresh();
+}
@@ -50,6 +50,7 @@ class MapeditWidget : public wxScrolledCanvas {
     void OnMouseMove(wxMouseEvent& event);
     void OnMouseUp(wxMouseEvent& event);
     void OnMouseOut(wxMouseEvent& event);
+    void OnScroll(wxScrollWinEvent& event);
     
   private:
     void SetTile(wxPoint pos);