diff options
| -rw-r--r-- | xfa/fwl/core/fwl_widgetdef.h | 1 | ||||
| -rw-r--r-- | xfa/fwl/core/ifwl_form.cpp | 43 |
2 files changed, 2 insertions, 42 deletions
diff --git a/xfa/fwl/core/fwl_widgetdef.h b/xfa/fwl/core/fwl_widgetdef.h index c01f5404ae..de4d292a7b 100644 --- a/xfa/fwl/core/fwl_widgetdef.h +++ b/xfa/fwl/core/fwl_widgetdef.h @@ -11,7 +11,6 @@ #define FWL_WGTSTYLE_Popup (1L << 0) #define FWL_WGTSTYLE_Child (2L << 0) #define FWL_WGTSTYLE_Border (1L << 2) -#define FWL_WGTSTYLE_Caption (1L << 3) #define FWL_WGTSTYLE_NarrowCaption (1L << 4) #define FWL_WGTSTYLE_Icon (1L << 5) #define FWL_WGTSTYLE_MinimizeBox (1L << 6) diff --git a/xfa/fwl/core/ifwl_form.cpp b/xfa/fwl/core/ifwl_form.cpp index 83fba1fd04..a074255237 100644 --- a/xfa/fwl/core/ifwl_form.cpp +++ b/xfa/fwl/core/ifwl_form.cpp @@ -99,39 +99,8 @@ void IFWL_Form::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) { } void IFWL_Form::GetClientRect(CFX_RectF& rect) { - if ((m_pProperties->m_dwStyles & FWL_WGTSTYLE_Caption) == 0) { - rect = m_pProperties->m_rtWidget; - rect.Offset(-rect.left, -rect.top); - return; - } - -#ifdef FWL_UseMacSystemBorder - rect = m_rtRelative; - CFWL_WidgetMgr* pWidgetMgr = GetOwnerApp()->GetWidgetMgr(); - if (!pWidgetMgr) - return; - - rect.left = 0; - rect.top = 0; -#else - FX_FLOAT x = 0; - FX_FLOAT y = 0; - FX_FLOAT t = 0; - IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider; - if (pTheme) { - CFWL_ThemePart part; - part.m_pWidget = this; - x = *static_cast<FX_FLOAT*>( - pTheme->GetCapacity(&part, CFWL_WidgetCapacity::CXBorder)); - y = *static_cast<FX_FLOAT*>( - pTheme->GetCapacity(&part, CFWL_WidgetCapacity::CYBorder)); - t = *static_cast<FX_FLOAT*>( - pTheme->GetCapacity(&part, CFWL_WidgetCapacity::CYCaption)); - } rect = m_pProperties->m_rtWidget; rect.Offset(-rect.left, -rect.top); - rect.Deflate(x, t, x, y); -#endif } void IFWL_Form::Update() { @@ -248,13 +217,7 @@ void IFWL_Form::DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) { param.m_dwStates = iState; pTheme->DrawBackground(¶m); } - if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_Caption) { - param.m_iPart = CFWL_Part::Caption; - param.m_dwStates = iState; - param.m_rtPart = m_rtCaption; - pTheme->DrawBackground(¶m); - DrawCaptionText(pGraphics, pTheme, pMatrix); - } else if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_NarrowCaption) { + if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_NarrowCaption) { param.m_iPart = CFWL_Part::NarrowCaption; param.m_dwStates = iState; param.m_rtPart = m_rtCaption; @@ -453,9 +416,7 @@ int32_t IFWL_Form::GetSysBtnIndex(CFWL_SysBtn* pBtn) { FX_FLOAT IFWL_Form::GetCaptionHeight() { CFWL_WidgetCapacity dwCapacity = CFWL_WidgetCapacity::None; - if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_Caption) - dwCapacity = CFWL_WidgetCapacity::CYCaption; - else if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_NarrowCaption) + if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_NarrowCaption) dwCapacity = CFWL_WidgetCapacity::CYNarrowCaption; if (dwCapacity != CFWL_WidgetCapacity::None) { |