1、统一了控件class name和interface name

2、修正了若干bug
GXKe · Mar 17, 2016 · 02d1ed8 · 02d1ed8
1 parent ab71040
commit 02d1ed8
Show file tree

Hide file tree

Showing 93 changed files with 4,658 additions and 1,509 deletions.
diff --git a/360SafeDemo/360Safe.cpp b/360SafeDemo/360Safe.cpp
@@ -135,9 +135,9 @@ class C360SafeFrameWnd : public CWindowWnd, public INotifyUI
 		if( pt.x >= rcClient.left + rcCaption.left && pt.x < rcClient.right - rcCaption.right \
 			&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom ) {
 				CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-				if( pControl && _tcscmp(pControl->GetClass(), _T("ButtonUI")) != 0 && 
-					_tcscmp(pControl->GetClass(), _T("OptionUI")) != 0 &&
-					_tcscmp(pControl->GetClass(), _T("TextUI")) != 0 )
+				if( pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0 && 
+					_tcscmp(pControl->GetClass(), DUI_CTR_OPTION) != 0 &&
+					_tcscmp(pControl->GetClass(), DUI_CTR_TEXT) != 0 )
 					return HTCAPTION;
 		}
 

diff --git a/DuiLib/Control/UIActiveX.cpp b/DuiLib/Control/UIActiveX.cpp
@@ -933,7 +933,7 @@ CActiveXUI::~CActiveXUI()
 
 LPCTSTR CActiveXUI::GetClass() const
 {
-    return _T("ActiveXUI");
+    return DUI_CTR_ACTIVEX;
 }
 
 LPVOID CActiveXUI::GetInterface(LPCTSTR pstrName)
@@ -1019,12 +1019,13 @@ void CActiveXUI::Move(SIZE szOffset, bool bNeedInvalidate)
 	}
 }
 
-void CActiveXUI::DoPaint(HDC hDC, const RECT& rcPaint, CControlUI* pStopControl)
+bool CActiveXUI::DoPaint(HDC hDC, const RECT& rcPaint, CControlUI* pStopControl)
 {
     if( m_pControl != NULL && m_pControl->m_bWindowless && m_pControl->m_pViewObject != NULL )
     {
         m_pControl->m_pViewObject->Draw(DVASPECT_CONTENT, -1, NULL, NULL, NULL, hDC, (RECTL*) &m_rcItem, (RECTL*) &m_rcItem, NULL, NULL); 
     }
+    return true;
 }
 
 void CActiveXUI::SetAttribute(LPCTSTR pstrName, LPCTSTR pstrValue)
@@ -1058,7 +1059,7 @@ LRESULT CActiveXUI::MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, bool
         if( dwHitResult != HITRESULT_HIT ) return 0;
         if( uMsg == WM_SETCURSOR ) bWasHandled = false;
         else if( uMsg == WM_LBUTTONDOWN || uMsg == WM_LBUTTONDBLCLK || uMsg == WM_RBUTTONDOWN ) {
-            ::SetFocus(GetManager()->GetPaintWindow());
+            if (!GetManager()->IsNoActivate()) ::SetFocus(GetManager()->GetPaintWindow());
             SetFocus();
         }
     }

diff --git a/DuiLib/Control/UIActiveX.h b/DuiLib/Control/UIActiveX.h
@@ -25,7 +25,7 @@ class CSafeRelease
 /////////////////////////////////////////////////////////////////////////////////////
 //
 
-class UILIB_API CActiveXUI : public CControlUI, public IMessageFilterUI
+class DUILIB_API CActiveXUI : public CControlUI, public IMessageFilterUI
 {
     friend class CActiveXCtrl;
 public:
@@ -51,7 +51,7 @@ class UILIB_API CActiveXUI : public CControlUI, public IMessageFilterUI
     void SetInternVisible(bool bVisible = true);
 	void SetPos(RECT rc, bool bNeedInvalidate = true);
 	void Move(SIZE szOffset, bool bNeedInvalidate = true);
-    void DoPaint(HDC hDC, const RECT& rcPaint, CControlUI* pStopControl);
+    bool DoPaint(HDC hDC, const RECT& rcPaint, CControlUI* pStopControl);
 
     void SetAttribute(LPCTSTR pstrName, LPCTSTR pstrValue);
 

diff --git a/DuiLib/Control/UIButton.cpp b/DuiLib/Control/UIButton.cpp
@@ -17,7 +17,7 @@ namespace DuiLib
 
 	LPCTSTR CButtonUI::GetClass() const
 	{
-		return _T("ButtonUI");
+		return DUI_CTR_BUTTON;
 	}
 
 	LPVOID CButtonUI::GetInterface(LPCTSTR pstrName)
@@ -49,7 +49,7 @@ namespace DuiLib
 		}
 		if( event.Type == UIEVENT_KEYDOWN )
 		{
-			if (IsKeyboardEnabled()) {
+			if (IsKeyboardEnabled() && IsEnabled()) {
 				if( event.chKey == VK_SPACE || event.chKey == VK_RETURN ) {
 					Activate();
 					return;
@@ -76,41 +76,51 @@ namespace DuiLib
 		if( event.Type == UIEVENT_BUTTONUP )
 		{
 			if( (m_uButtonState & UISTATE_CAPTURED) != 0 ) {
-				if( ::PtInRect(&m_rcItem, event.ptMouse) ) Activate();
+				if( ::PtInRect(&m_rcItem, event.ptMouse) && IsEnabled()) Activate();
 				m_uButtonState &= ~(UISTATE_PUSHED | UISTATE_CAPTURED);
 				Invalidate();
 			}
 			return;
 		}
 		if( event.Type == UIEVENT_CONTEXTMENU )
 		{
-			if( IsContextMenuUsed() ) {
+			if( IsContextMenuUsed() && IsEnabled()) {
 				m_pManager->SendNotify(this, DUI_MSGTYPE_MENU, event.wParam, event.lParam);
 			}
 			return;
 		}
 		if( event.Type == UIEVENT_MOUSEENTER )
 		{
-			if( IsEnabled() ) {
-				m_uButtonState |= UISTATE_HOT;
-				Invalidate();
-			}
+            if( ::PtInRect(&m_rcItem, event.ptMouse ) ) {
+                if( IsEnabled() ) {
+                    if( (m_uButtonState & UISTATE_HOT) == 0  ) {
+                        m_uButtonState |= UISTATE_HOT;
+                        Invalidate();
+                    }
+                }
+            }
 			if ( GetFadeAlphaDelta() > 0 ) {
 				m_pManager->SetTimer(this, FADE_TIMERID, FADE_ELLAPSE);
 			}
-			// return;
 		}
 		if( event.Type == UIEVENT_MOUSELEAVE )
 		{
-			if( IsEnabled() ) {
-				m_uButtonState &= ~UISTATE_HOT;
-				Invalidate();
-			}
-
-			if ( GetFadeAlphaDelta() > 0 ) {
-				m_pManager->SetTimer(this, FADE_TIMERID, FADE_ELLAPSE);
-			}
-			// return;
+            if( !::PtInRect(&m_rcItem, event.ptMouse ) ) {
+                if( IsEnabled() ) {
+                    if( (m_uButtonState & UISTATE_HOT) != 0  ) {
+                        m_uButtonState &= ~UISTATE_HOT;
+                        Invalidate();
+                    }
+                }
+                if (m_pManager) m_pManager->RemoveMouseLeaveNeeded(this);
+                if ( GetFadeAlphaDelta() > 0 ) {
+                    m_pManager->SetTimer(this, FADE_TIMERID, FADE_ELLAPSE);
+                }
+            }
+            else {
+                if (m_pManager) m_pManager->AddMouseLeaveNeeded(this);
+                return;
+            }
 		}
 		if( event.Type == UIEVENT_SETCURSOR )
 		{
@@ -426,7 +436,7 @@ namespace DuiLib
 
 		if( m_bShowHtml )
 			CRenderEngine::DrawHtmlText(hDC, m_pManager, rc, m_sText, clrColor, \
-			NULL, NULL, nLinks, m_uTextStyle);
+			NULL, NULL, nLinks, m_iFont, m_uTextStyle);
 		else
 			CRenderEngine::DrawText(hDC, m_pManager, rc, m_sText, clrColor, \
 			m_iFont, m_uTextStyle);

diff --git a/DuiLib/Control/UIButton.h b/DuiLib/Control/UIButton.h
@@ -5,7 +5,7 @@
 
 namespace DuiLib
 {
-	class UILIB_API CButtonUI : public CLabelUI
+	class DUILIB_API CButtonUI : public CLabelUI
 	{
 	public:
 		CButtonUI();

diff --git a/DuiLib/Control/UICheckBox.cpp b/DuiLib/Control/UICheckBox.cpp
@@ -5,7 +5,7 @@ namespace DuiLib
 {
 	LPCTSTR CCheckBoxUI::GetClass() const
 	{
-		return _T("CheckBoxUI");
+		return DUI_CTR_CHECKBOX;
 	}
 
 	LPVOID CCheckBoxUI::GetInterface(LPCTSTR pstrName)

diff --git a/DuiLib/Control/UICheckBox.h b/DuiLib/Control/UICheckBox.h
@@ -9,7 +9,7 @@ namespace DuiLib
 	/// 派生于COptionUI，只是每组只有一个按钮而已，组名为空，配置文件默认属性举例：
 	/// <CheckBox name="CheckBox" value="height='20' align='left' textpadding='24,0,0,0' normalimage='file='sys_check_btn.png' source='0,0,20,20' dest='0,0,20,20'' selectedimage='file='sys_check_btn.png' source='20,0,40,20' dest='0,0,20,20'' disabledimage='file='sys_check_btn.png' source='40,0,60,20' dest='0,0,20,20''"/>
 
-	class UILIB_API CCheckBoxUI : public COptionUI
+	class DUILIB_API CCheckBoxUI : public COptionUI
 	{
 	public:
 		LPCTSTR GetClass() const;