improve mouse cursor updates when leaving in-place controls (#2572)

clsid2 · Feb 15, 2024 · e459a32 · e459a32
1 parent 2d57652
commit e459a32
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/mpc-hc/PlayerListCtrl.cpp b/src/mpc-hc/PlayerListCtrl.cpp
@@ -701,6 +701,8 @@ bool CPlayerListCtrl::PrepareInPlaceControl(int nRow, int nCol, CRect& rect)
 
     rect.DeflateRect(1, 0, 0, 1);
     inPlaceControl = true;
+    inPlaceControlRect = rect;
+    ClientToScreen(inPlaceControlRect);
     return true;
 }
 
@@ -1116,10 +1118,13 @@ void CPlayerListCtrl::OnXButtonDblClk(UINT nFlags, UINT nButton, CPoint point)
 
 BOOL CPlayerListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) {
     if (inPlaceControl) {
-        return FALSE;
-    } else {
-        return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
+        POINT p;
+        GetCursorPos(&p);
+        if (inPlaceControlRect.PtInRect(p)) {
+            return FALSE;
+        }
     }
+    return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
 }
 
 

diff --git a/src/mpc-hc/PlayerListCtrl.h b/src/mpc-hc/PlayerListCtrl.h
@@ -150,6 +150,7 @@ class CPlayerListCtrl : public CMPCThemePlayerListCtrl
     int m_nItemClicked, m_nSubItemClicked;
     int m_tStartEditingDelay;
     bool inPlaceControl;
+    CRect inPlaceControlRect;
     UINT_PTR m_nTimerID;
 
     bool PrepareInPlaceControl(int nRow, int nCol, CRect& rect);