diff --git a/Demos/ADMonSetup/Debug/ADMonSetup.unsuccessfulbuild b/Demos/ADMonSetup/Debug/ADMonSetup.unsuccessfulbuild new file mode 100644 index 00000000..e69de29b diff --git a/Demos/duidemo/MainWnd.h b/Demos/duidemo/MainWnd.h index b5845784..5fdf4659 100644 --- a/Demos/duidemo/MainWnd.h +++ b/Demos/duidemo/MainWnd.h @@ -23,14 +23,14 @@ class CDemoFrame : public WindowImplBase, public CWebBrowserEventHandler, public pBrowser1->SetWebBrowserEventHandler(this); CWebBrowserUI* pBrowser2 = static_cast(m_PaintManager.FindControl(_T("oneclick_browser2"))); pBrowser2->SetWebBrowserEventHandler(this); - pBrowser1->NavigateUrl(_T("http://www.winradar.com/?f=duidemo")); + pBrowser1->NavigateUrl(_T("http://blog.csdn.net/duisharp")); pBrowser2->NavigateUrl(_T("http://www.2345.com/?kms656067418")); CComboUI* pFontSize = static_cast(m_PaintManager.FindControl(_T("font_size"))); if(pFontSize) { CListLabelElementUI * pElement = new CListLabelElementUI(); - pElement->SetText(_T("aklsdjfajsdlkf")); + pElement->SetText(_T("²âÊÔ³¤ÎÄ×Ö")); pElement->SetFixedHeight(30); pElement->SetFixedWidth(120); pFontSize->Add(pElement); diff --git a/DuiLib/Utils/UIShadow.cpp b/DuiLib/Utils/UIShadow.cpp index b17ade48..40739278 100644 --- a/DuiLib/Utils/UIShadow.cpp +++ b/DuiLib/Utils/UIShadow.cpp @@ -122,18 +122,9 @@ LRESULT CALLBACK CShadowUI::ParentProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR { RECT WndRect; GetWindowRect(hwnd, &WndRect); - if (pThis->m_bIsImageMode) - { - SetWindowPos(pThis->m_hWnd, 0, - WndRect.left - pThis->m_rcShadowCorner.left, WndRect.top - pThis->m_rcShadowCorner.top, - 0, 0, SWP_NOSIZE | SWP_NOACTIVATE); - } - else - { - SetWindowPos(pThis->m_hWnd, 0, + SetWindowPos(pThis->m_hWnd, 0, WndRect.left + pThis->m_nxOffset - pThis->m_nSize, WndRect.top + pThis->m_nyOffset - pThis->m_nSize, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE); - } } break; @@ -227,19 +218,8 @@ void CShadowUI::Update(HWND hParent) GetWindowRect(hParent, &WndRect); int nShadWndWid; int nShadWndHei; - if (m_bIsImageMode) - { - if(m_sShadowImage.IsEmpty()) - return; - - nShadWndWid = WndRect.right - WndRect.left + m_rcShadowCorner.left + m_rcShadowCorner.right; - nShadWndHei = WndRect.bottom - WndRect.top + m_rcShadowCorner.top + m_rcShadowCorner.bottom; - } - else - { - nShadWndWid = WndRect.right - WndRect.left + m_nSize * 2; - nShadWndHei = WndRect.bottom - WndRect.top + m_nSize * 2; - } + nShadWndWid = WndRect.right - WndRect.left + m_nSize * 2; + nShadWndHei = WndRect.bottom - WndRect.top + m_nSize * 2; // Create the alpha blending bitmap BITMAPINFO bmi; // bitmap header @@ -263,16 +243,12 @@ void CShadowUI::Update(HWND hParent) RECT rcPaint = {0, 0, nShadWndWid, nShadWndHei}; const TImageInfo* data = m_pManager->GetImageEx((LPCTSTR)m_sShadowImage, NULL, 0); - - if( !data ) - return; + if( !data ) return; RECT rcBmpPart = {0}; rcBmpPart.right = data->nX; rcBmpPart.bottom = data->nY; - CRenderEngine::DrawImage(hMemDC, data->hBitmap, rcPaint, rcPaint, rcBmpPart, m_rcShadowCorner, data->alphaChannel, 0xFF, true, false, false); - } else { @@ -281,16 +257,8 @@ void CShadowUI::Update(HWND hParent) } POINT ptDst; - if (m_bIsImageMode) - { - ptDst.x = WndRect.left - m_rcShadowCorner.left; - ptDst.y = WndRect.top - m_rcShadowCorner.top; - } - else - { - ptDst.x = WndRect.left + m_nxOffset - m_nSize; - ptDst.y = WndRect.top + m_nyOffset - m_nSize; - } + ptDst.x = WndRect.left + m_nxOffset - m_nSize; + ptDst.y = WndRect.top + m_nyOffset - m_nSize; POINT ptSrc = {0, 0}; SIZE WndSize = {nShadWndWid, nShadWndHei}; diff --git a/DuiLib_Ultimate.zip b/DuiLib_Ultimate.zip new file mode 100644 index 00000000..2df81998 Binary files /dev/null and b/DuiLib_Ultimate.zip differ diff --git a/bin/skin/duidemo/main.xml b/bin/skin/duidemo/main.xml index 931778e8..8be9043c 100644 --- a/bin/skin/duidemo/main.xml +++ b/bin/skin/duidemo/main.xml @@ -1,5 +1,5 @@ - + @@ -51,18 +51,17 @@ -