From 878dd5b121b38e6eaba5b3f3a90d0a9abf60feaf Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 17 Oct 2016 18:14:25 -0700 Subject: Cleanup unneeded FWL theme code. This CL removes FWL theme code methods which do not have implementations. Review-Url: https://codereview.chromium.org/2422373002 --- xfa/fwl/core/fwl_formimp.cpp | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) (limited to 'xfa/fwl/core/fwl_formimp.cpp') diff --git a/xfa/fwl/core/fwl_formimp.cpp b/xfa/fwl/core/fwl_formimp.cpp index 1b82ff59f8..4dcedf67f9 100644 --- a/xfa/fwl/core/fwl_formimp.cpp +++ b/xfa/fwl/core/fwl_formimp.cpp @@ -652,12 +652,7 @@ void CFWL_FormImp::ReSetSysBtn() { m_iSysBox = 0; if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_CloseBox) { m_pCloseBox = new CFWL_SysBtn; - if (m_bCustomizeLayout) { - CFWL_ThemeBackground param; - param.m_pWidget = m_pInterface; - param.m_iPart = CFWL_Part::CloseBox; - pTheme->GetPartRect(¶m, m_pCloseBox->m_rtBtn); - } else { + if (!m_bCustomizeLayout) { m_pCloseBox->m_rtBtn.Set( m_rtRelative.right() - kSystemButtonMargin - kSystemButtonSize, kSystemButtonMargin, kSystemButtonSize, kSystemButtonSize); @@ -666,12 +661,7 @@ void CFWL_FormImp::ReSetSysBtn() { } if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_MaximizeBox) { m_pMaxBox = new CFWL_SysBtn; - if (m_bCustomizeLayout) { - CFWL_ThemeBackground param; - param.m_pWidget = m_pInterface; - param.m_iPart = CFWL_Part::MaximizeBox; - pTheme->GetPartRect(¶m, m_pMaxBox->m_rtBtn); - } else { + if (!m_bCustomizeLayout) { if (m_pCloseBox) { m_pMaxBox->m_rtBtn.Set( m_pCloseBox->m_rtBtn.left - kSystemButtonSpan - kSystemButtonSize, @@ -686,12 +676,7 @@ void CFWL_FormImp::ReSetSysBtn() { } if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_MinimizeBox) { m_pMinBox = new CFWL_SysBtn; - if (m_bCustomizeLayout) { - CFWL_ThemeBackground param; - param.m_pWidget = m_pInterface; - param.m_iPart = CFWL_Part::MinimizeBox; - pTheme->GetPartRect(¶m, m_pMinBox->m_rtBtn); - } else { + if (!m_bCustomizeLayout) { if (m_pMaxBox) { m_pMinBox->m_rtBtn.Set( m_pMaxBox->m_rtBtn.left - kSystemButtonSpan - kSystemButtonSize, @@ -712,26 +697,11 @@ void CFWL_FormImp::ReSetSysBtn() { static_cast(m_pProperties->m_pDataProvider); if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_Icon && pData->GetIcon(m_pInterface, FALSE)) { - if (m_bCustomizeLayout) { - CFWL_ThemeBackground param; - param.m_pWidget = m_pInterface; - param.m_iPart = CFWL_Part::Icon; - CFX_WideString wsText; - m_pProperties->m_pDataProvider->GetCaption(m_pInterface, wsText); - param.m_pData = &wsText; - pTheme->GetPartRect(¶m, m_rtIcon); - } else { + if (!m_bCustomizeLayout) { m_rtIcon.Set(5, (m_rtCaption.height - m_fSmallIconSz) / 2, m_fSmallIconSz, m_fSmallIconSz); } } - if (m_bCustomizeLayout) { - CFWL_ThemeText parma; - parma.m_pWidget = m_pInterface; - parma.m_iPart = CFWL_Part::HeadText; - m_pProperties->m_pDataProvider->GetCaption(m_pInterface, parma.m_wsText); - pTheme->GetPartRect(&parma, m_rtCaptionText); - } } void CFWL_FormImp::RegisterForm() { IFWL_App* pApp = GetOwnerApp(); -- cgit v1.2.3