From 49d5eaca4f17c99d61d59c1ba846cdd698035c30 Mon Sep 17 00:00:00 2001 From: evilbeast Date: Mon, 8 Jul 2019 23:37:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DCombo=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E5=9C=A8XML=E4=B8=AD=E8=AE=BE=E7=BD=AEdropbox=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=97=A0=E6=95=88=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tool_kits/duilib/Control/Combo.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tool_kits/duilib/Control/Combo.cpp b/tool_kits/duilib/Control/Combo.cpp index 19e015ff..4d41be08 100644 --- a/tool_kits/duilib/Control/Combo.cpp +++ b/tool_kits/duilib/Control/Combo.cpp @@ -257,6 +257,7 @@ std::wstring Combo::GetDropBoxAttributeList() void Combo::SetDropBoxAttributeList(const std::wstring& pstrList) { m_sDropBoxAttributes = pstrList; + m_pLayout->ApplyAttributeList(pstrList); } CSize Combo::GetDropBoxSize() const From 8f9b15faae9a28effcb0267851c775bafcd47d7d Mon Sep 17 00:00:00 2001 From: evilbeast Date: Tue, 9 Jul 2019 02:12:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DScrollableBox=E5=9C=A8?= =?UTF-8?q?=E7=BB=98=E5=88=B6=E5=AD=90=E9=A1=B9=E6=97=B6=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=A3=81=E5=89=AApadding=E5=8C=BA=E5=9F=9F=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tool_kits/duilib/Core/Box.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tool_kits/duilib/Core/Box.cpp b/tool_kits/duilib/Core/Box.cpp index 90259f01..69c0cf7d 100644 --- a/tool_kits/duilib/Core/Box.cpp +++ b/tool_kits/duilib/Core/Box.cpp @@ -1015,7 +1015,8 @@ void ScrollableBox::PaintChild(IRenderContext* pRender, const UiRect& rcPaint) } else { CSize scrollPos = GetScrollPos(); - UiRect rcNewPaint = rcPaint; + UiRect rcNewPaint = GetPaddingPos(); + AutoClip alphaClip(pRender, rcNewPaint, m_bClip); rcNewPaint.Offset(scrollPos.cx, scrollPos.cy); rcNewPaint.Offset(GetRenderOffset().x, GetRenderOffset().y);