caiyu/nim_duilib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #71 from lovesnow/development

Browse Source 
修复Combo控件在XML中设置dropbox属性无效的bug
This commit is contained in:
Dylan 2019-07-09 09:35:34 +08:00 committed by GitHub
commit 3856f80a5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tool_kits/duilib/Control/Combo.cpp
View File

@ -257,6 +257,7 @@ std::wstring Combo::GetDropBoxAttributeList()
void Combo::SetDropBoxAttributeList(const std::wstring& pstrList) void Combo::SetDropBoxAttributeList(const std::wstring& pstrList)
{ {
m_sDropBoxAttributes = pstrList; m_sDropBoxAttributes = pstrList;
m_pLayout->ApplyAttributeList(pstrList);
} }
CSize Combo::GetDropBoxSize() const CSize Combo::GetDropBoxSize() const

3
tool_kits/duilib/Core/Box.cpp
View File

@ -1015,7 +1015,8 @@ void ScrollableBox::PaintChild(IRenderContext* pRender, const UiRect& rcPaint)
} }
else { else {
CSize scrollPos = GetScrollPos(); CSize scrollPos = GetScrollPos();
UiRect rcNewPaint = rcPaint; UiRect rcNewPaint = GetPaddingPos();
AutoClip alphaClip(pRender, rcNewPaint, m_bClip);
rcNewPaint.Offset(scrollPos.cx, scrollPos.cy); rcNewPaint.Offset(scrollPos.cx, scrollPos.cy);
rcNewPaint.Offset(GetRenderOffset().x, GetRenderOffset().y); rcNewPaint.Offset(GetRenderOffset().x, GetRenderOffset().y);