Merge pull request qdtroy#157 from nakkler/master

fix CButtonUI bug
hihuangjianxin · Sep 5, 2022 · ab106eb · ab106eb
2 parents bfa997c + 7cf455c
commit ab106eb
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/DuiLib/Control/UIButton.cpp b/DuiLib/Control/UIButton.cpp
@@ -77,11 +77,14 @@ namespace DuiLib
 		}	
 		if( event.Type == UIEVENT_MOUSEMOVE )
 		{
-			if( (m_uButtonState & UISTATE_CAPTURED) != 0 ) {
-				if( ::PtInRect(&m_rcItem, event.ptMouse) ) m_uButtonState |= UISTATE_PUSHED;
-				else m_uButtonState &= ~UISTATE_PUSHED;
-				Invalidate();
-			}
+			if (m_pManager->IsCaptured())
+			{
+				if( (m_uButtonState & UISTATE_CAPTURED) != 0 ) {
+					if( ::PtInRect(&m_rcItem, event.ptMouse) ) m_uButtonState |= UISTATE_PUSHED;
+					else m_uButtonState &= ~UISTATE_PUSHED;
+					Invalidate();
+				}
+			}			
 			return;
 		}
 		if( event.Type == UIEVENT_BUTTONUP )