From d49094d01430c0a0f4b8aa39a3e4cf619be7d9f2 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 15 Mar 2021 15:01:36 +0300 Subject: fixes #2766 (Spin control suddenly returns previous position when called from inside WM_NOTIFY) --- src/mir_core/src/CCtrlSpin.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/mir_core') diff --git a/src/mir_core/src/CCtrlSpin.cpp b/src/mir_core/src/CCtrlSpin.cpp index 361c3eb74f..2c254025b7 100644 --- a/src/mir_core/src/CCtrlSpin.cpp +++ b/src/mir_core/src/CCtrlSpin.cpp @@ -34,6 +34,9 @@ CCtrlSpin::CCtrlSpin(CDlgBase *dlg, int ctrlId, WORD wMax, WORD wMin) : BOOL CCtrlSpin::OnNotify(int, NMHDR *pnmh) { if (pnmh->code == UDN_DELTAPOS) { + auto *pEvent = (NMUPDOWN *)pnmh; + m_wCurr = pEvent->iPos + pEvent->iDelta; + NotifyChange(); return TRUE; } @@ -59,10 +62,10 @@ void CCtrlSpin::OnReset() WORD CCtrlSpin::GetPosition() { - return SendMsg(UDM_GETPOS, 0, 0); + return m_wCurr; } void CCtrlSpin::SetPosition(WORD wPos) { - SendMsg(UDM_SETPOS, 0, wPos); + SendMsg(UDM_SETPOS, 0, m_wCurr = wPos); } -- cgit v1.2.3