| Index: xfa/fwl/lightwidget/cfwl_widget.cpp
|
| diff --git a/xfa/fwl/lightwidget/cfwl_widget.cpp b/xfa/fwl/lightwidget/cfwl_widget.cpp
|
| index fe2b35c46b69140d8abc596d8cec351e5cde87db..c77bfc215c97755b75ed7924abe185d7307c7898 100644
|
| --- a/xfa/fwl/lightwidget/cfwl_widget.cpp
|
| +++ b/xfa/fwl/lightwidget/cfwl_widget.cpp
|
| @@ -18,30 +18,24 @@
|
| #define FWL_WGT_CalcWidth 2048
|
| #define FWL_WGT_CalcMultiLineDefWidth 120.0f
|
|
|
| -IFWL_Widget* CFWL_Widget::GetWidget() {
|
| - return m_pIface.get();
|
| -}
|
| -
|
| -const IFWL_Widget* CFWL_Widget::GetWidget() const {
|
| - return m_pIface.get();
|
| +CFWL_Widget::CFWL_Widget()
|
| + : m_pDelegate(nullptr),
|
| + m_pWidgetMgr(CFWL_WidgetMgr::GetInstance()),
|
| + m_pProperties(new CFWL_WidgetProperties) {
|
| + ASSERT(m_pWidgetMgr);
|
| }
|
|
|
| -FWL_Error CFWL_Widget::GetClassName(CFX_WideString& wsClass) const {
|
| - if (!m_pIface)
|
| - return FWL_Error::Indefinite;
|
| - return m_pIface->GetClassName(wsClass);
|
| +CFWL_Widget::~CFWL_Widget() {
|
| + if (m_pIface)
|
| + m_pIface->Finalize();
|
| }
|
|
|
| -FWL_Type CFWL_Widget::GetClassID() const {
|
| - if (!m_pIface)
|
| - return FWL_Type::Unknown;
|
| - return m_pIface->GetClassID();
|
| +IFWL_Widget* CFWL_Widget::GetWidget() {
|
| + return m_pIface.get();
|
| }
|
|
|
| -FX_BOOL CFWL_Widget::IsInstance(const CFX_WideStringC& wsClass) const {
|
| - if (!m_pIface)
|
| - return FALSE;
|
| - return m_pIface->IsInstance(wsClass);
|
| +const IFWL_Widget* CFWL_Widget::GetWidget() const {
|
| + return m_pIface.get();
|
| }
|
|
|
| FWL_Error CFWL_Widget::Initialize(const CFWL_WidgetProperties* pProperties) {
|
| @@ -75,39 +69,6 @@ FWL_Error CFWL_Widget::GetClientRect(CFX_RectF& rect) {
|
| return m_pIface->GetClientRect(rect);
|
| }
|
|
|
| -CFWL_Widget* CFWL_Widget::GetParent() {
|
| - if (!m_pIface)
|
| - return nullptr;
|
| -
|
| - IFWL_Widget* parent = m_pIface->GetParent();
|
| - if (!parent)
|
| - return nullptr;
|
| -
|
| - return static_cast<CFWL_Widget*>(parent->GetAssociateWidget());
|
| -}
|
| -
|
| -FWL_Error CFWL_Widget::SetParent(CFWL_Widget* pParent) {
|
| - if (!m_pIface)
|
| - return FWL_Error::Indefinite;
|
| - return m_pIface->SetParent(pParent ? pParent->GetWidget() : nullptr);
|
| -}
|
| -
|
| -CFWL_Widget* CFWL_Widget::GetOwner() {
|
| - return nullptr;
|
| -}
|
| -
|
| -FWL_Error CFWL_Widget::SetOwner(CFWL_Widget* pOwner) {
|
| - if (!m_pIface)
|
| - return FWL_Error::Indefinite;
|
| - return FWL_Error::Succeeded;
|
| -}
|
| -
|
| -uint32_t CFWL_Widget::GetStyles() {
|
| - if (!m_pIface)
|
| - return 0;
|
| - return m_pIface->GetStyles();
|
| -}
|
| -
|
| FWL_Error CFWL_Widget::ModifyStyles(uint32_t dwStylesAdded,
|
| uint32_t dwStylesRemoved) {
|
| if (!m_pIface)
|
| @@ -135,31 +96,27 @@ void CFWL_Widget::SetStates(uint32_t dwStates, FX_BOOL bSet) {
|
| m_pIface->SetStates(dwStates, bSet);
|
| }
|
|
|
| -void* CFWL_Widget::GetLayoutItem() const {
|
| - return m_pIface ? m_pIface->GetLayoutItem() : nullptr;
|
| -}
|
| -
|
| void CFWL_Widget::SetLayoutItem(void* pItem) {
|
| if (m_pIface)
|
| m_pIface->SetLayoutItem(pItem);
|
| }
|
|
|
| -FWL_Error CFWL_Widget::Update() {
|
| +void CFWL_Widget::Update() {
|
| if (!m_pIface)
|
| - return FWL_Error::Indefinite;
|
| - return m_pIface->Update();
|
| + return;
|
| + m_pIface->Update();
|
| }
|
|
|
| -FWL_Error CFWL_Widget::LockUpdate() {
|
| +void CFWL_Widget::LockUpdate() {
|
| if (!m_pIface)
|
| - return FWL_Error::Indefinite;
|
| - return m_pIface->LockUpdate();
|
| + return;
|
| + m_pIface->LockUpdate();
|
| }
|
|
|
| -FWL_Error CFWL_Widget::UnlockUpdate() {
|
| +void CFWL_Widget::UnlockUpdate() {
|
| if (!m_pIface)
|
| - return FWL_Error::Indefinite;
|
| - return m_pIface->UnlockUpdate();
|
| + return;
|
| + m_pIface->UnlockUpdate();
|
| }
|
|
|
| FWL_WidgetHit CFWL_Widget::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
|
| @@ -168,33 +125,6 @@ FWL_WidgetHit CFWL_Widget::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
|
| return m_pIface->HitTest(fx, fy);
|
| }
|
|
|
| -FWL_Error CFWL_Widget::TransformTo(CFWL_Widget* pWidget,
|
| - FX_FLOAT& fx,
|
| - FX_FLOAT& fy) {
|
| - if (!m_pIface)
|
| - return FWL_Error::Indefinite;
|
| - return m_pIface->TransformTo(pWidget ? pWidget->GetWidget() : nullptr, fx,
|
| - fy);
|
| -}
|
| -
|
| -FWL_Error CFWL_Widget::TransformTo(CFWL_Widget* pWidget, CFX_RectF& rt) {
|
| - if (!m_pIface)
|
| - return FWL_Error::Indefinite;
|
| - return m_pIface->TransformTo(pWidget ? pWidget->GetWidget() : nullptr, rt);
|
| -}
|
| -
|
| -FWL_Error CFWL_Widget::GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal) {
|
| - if (!m_pIface)
|
| - return FWL_Error::Indefinite;
|
| - return m_pIface->GetMatrix(matrix, bGlobal);
|
| -}
|
| -
|
| -FWL_Error CFWL_Widget::SetMatrix(const CFX_Matrix& matrix) {
|
| - if (!m_pIface)
|
| - return FWL_Error::Indefinite;
|
| - return m_pIface->SetMatrix(matrix);
|
| -}
|
| -
|
| FWL_Error CFWL_Widget::DrawWidget(CFX_Graphics* pGraphics,
|
| const CFX_Matrix* pMatrix) {
|
| if (!m_pIface)
|
| @@ -209,128 +139,3 @@ IFWL_WidgetDelegate* CFWL_Widget::SetDelegate(IFWL_WidgetDelegate* pDelegate) {
|
| m_pDelegate = m_pIface->SetDelegate(pDelegate);
|
| return m_pDelegate;
|
| }
|
| -
|
| -CFWL_Widget::CFWL_Widget()
|
| - : m_pDelegate(nullptr),
|
| - m_pWidgetMgr(CFWL_WidgetMgr::GetInstance()),
|
| - m_pProperties(new CFWL_WidgetProperties) {
|
| - ASSERT(m_pWidgetMgr);
|
| -}
|
| -
|
| -CFWL_Widget::~CFWL_Widget() {
|
| - if (m_pIface)
|
| - m_pIface->Finalize();
|
| -}
|
| -
|
| -FWL_Error CFWL_Widget::Repaint(const CFX_RectF* pRect) {
|
| - if (!m_pIface)
|
| - return FWL_Error::Indefinite;
|
| -
|
| - CFX_RectF rect;
|
| - if (pRect) {
|
| - rect = *pRect;
|
| - } else {
|
| - m_pIface->GetWidgetRect(rect);
|
| - rect.left = rect.top = 0;
|
| - }
|
| - return m_pWidgetMgr->RepaintWidget(m_pIface.get(), &rect);
|
| -}
|
| -
|
| -FWL_Error CFWL_Widget::SetFocus(FX_BOOL bFocus) {
|
| - if (!m_pIface)
|
| - return FWL_Error::Indefinite;
|
| -
|
| - IFWL_App* pApp = m_pIface->GetOwnerApp();
|
| - if (!pApp)
|
| - return FWL_Error::Indefinite;
|
| -
|
| - CFWL_NoteDriver* pDriver = pApp->GetNoteDriver();
|
| - if (!pDriver)
|
| - return FWL_Error::Indefinite;
|
| -
|
| - if (bFocus) {
|
| - pDriver->SetFocus(m_pIface.get());
|
| - } else {
|
| - if (pDriver->GetFocus() == m_pIface.get()) {
|
| - pDriver->SetFocus(nullptr);
|
| - }
|
| - }
|
| - return FWL_Error::Succeeded;
|
| -}
|
| -
|
| -FWL_Error CFWL_Widget::SetGrab(FX_BOOL bSet) {
|
| - if (!m_pIface)
|
| - return FWL_Error::Indefinite;
|
| -
|
| - IFWL_App* pApp = m_pIface->GetOwnerApp();
|
| - if (!pApp)
|
| - return FWL_Error::Indefinite;
|
| -
|
| - CFWL_NoteDriver* pDriver = pApp->GetNoteDriver();
|
| - if (!pDriver)
|
| - return FWL_Error::Indefinite;
|
| -
|
| - pDriver->SetGrab(m_pIface.get(), bSet);
|
| - return FWL_Error::Succeeded;
|
| -}
|
| -
|
| -void CFWL_Widget::RegisterEventTarget(CFWL_Widget* pEventSource,
|
| - uint32_t dwFilter) {
|
| - if (!m_pIface)
|
| - return;
|
| -
|
| - IFWL_App* pApp = m_pIface->GetOwnerApp();
|
| - if (!pApp)
|
| - return;
|
| -
|
| - CFWL_NoteDriver* pNoteDriver = pApp->GetNoteDriver();
|
| - if (!pNoteDriver)
|
| - return;
|
| -
|
| - IFWL_Widget* pEventSourceImp =
|
| - !pEventSource ? nullptr : pEventSource->GetWidget();
|
| - pNoteDriver->RegisterEventTarget(GetWidget(), pEventSourceImp, dwFilter);
|
| -}
|
| -
|
| -void CFWL_Widget::DispatchEvent(CFWL_Event* pEvent) {
|
| - if (!m_pIface)
|
| - return;
|
| - if (m_pIface->GetOuter())
|
| - return;
|
| -
|
| - IFWL_App* pApp = m_pIface->GetOwnerApp();
|
| - if (!pApp)
|
| - return;
|
| -
|
| - CFWL_NoteDriver* pNoteDriver = pApp->GetNoteDriver();
|
| - if (!pNoteDriver)
|
| - return;
|
| -
|
| - pNoteDriver->SendEvent(pEvent);
|
| -}
|
| -
|
| -CFX_SizeF CFWL_Widget::CalcTextSize(const CFX_WideString& wsText,
|
| - FX_BOOL bMultiLine,
|
| - int32_t iLineWidth) {
|
| - if (!m_pIface)
|
| - return CFX_SizeF();
|
| -
|
| - IFWL_ThemeProvider* pTheme = m_pIface->GetThemeProvider();
|
| - if (!pTheme)
|
| - return CFX_SizeF();
|
| -
|
| - CFWL_ThemeText calPart;
|
| - calPart.m_pWidget = m_pIface.get();
|
| - calPart.m_wsText = wsText;
|
| - calPart.m_dwTTOStyles =
|
| - bMultiLine ? FDE_TTOSTYLE_LineWrap : FDE_TTOSTYLE_SingleLine;
|
| - calPart.m_iTTOAlign = FDE_TTOALIGNMENT_TopLeft;
|
| - CFX_RectF rect;
|
| - FX_FLOAT fWidth = bMultiLine
|
| - ? (iLineWidth > 0 ? (FX_FLOAT)iLineWidth
|
| - : FWL_WGT_CalcMultiLineDefWidth)
|
| - : FWL_WGT_CalcWidth;
|
| - rect.Set(0, 0, fWidth, FWL_WGT_CalcHeight);
|
| - pTheme->CalcTextRect(&calPart, rect);
|
| - return CFX_SizeF(rect.width, rect.height);
|
| -}
|
|
|