diff options
author | dsinclair <dsinclair@chromium.org> | 2016-12-15 13:44:02 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-12-15 13:44:02 -0800 |
commit | 46a4bbf46723cd6375042d599d01fe08012eadd6 (patch) | |
tree | f0e0df5fce69c33557971c1bc52ff8b9c69dfaa0 /xfa/fwl | |
parent | d92477068ad0918c97a5dab799d8cfdf07ce3580 (diff) | |
download | pdfium-46a4bbf46723cd6375042d599d01fe08012eadd6.tar.xz |
Cleanup widget edge related code
CFWL_Widget::HasEdge() always returns false. This CL removes it and the
supporting code.
Review-Url: https://codereview.chromium.org/2575093002
Diffstat (limited to 'xfa/fwl')
-rw-r--r-- | xfa/fwl/cfwl_checkbox.cpp | 2 | ||||
-rw-r--r-- | xfa/fwl/cfwl_combobox.cpp | 2 | ||||
-rw-r--r-- | xfa/fwl/cfwl_datetimepicker.cpp | 2 | ||||
-rw-r--r-- | xfa/fwl/cfwl_edit.cpp | 2 | ||||
-rw-r--r-- | xfa/fwl/cfwl_listbox.cpp | 2 | ||||
-rw-r--r-- | xfa/fwl/cfwl_monthcalendar.cpp | 2 | ||||
-rw-r--r-- | xfa/fwl/cfwl_picturebox.cpp | 2 | ||||
-rw-r--r-- | xfa/fwl/cfwl_pushbutton.cpp | 4 | ||||
-rw-r--r-- | xfa/fwl/cfwl_scrollbar.cpp | 2 | ||||
-rw-r--r-- | xfa/fwl/cfwl_spinbutton.cpp | 4 | ||||
-rw-r--r-- | xfa/fwl/cfwl_themepart.h | 1 | ||||
-rw-r--r-- | xfa/fwl/cfwl_widget.cpp | 35 | ||||
-rw-r--r-- | xfa/fwl/cfwl_widget.h | 6 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_barcodetp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_comboboxtp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_datetimepickertp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_edittp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_listboxtp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_monthcalendartp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_pictureboxtp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_pushbuttontp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_widgettp.cpp | 25 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_widgettp.h | 4 |
23 files changed, 1 insertions, 134 deletions
diff --git a/xfa/fwl/cfwl_checkbox.cpp b/xfa/fwl/cfwl_checkbox.cpp index 26ac053ce7..5d40d8f425 100644 --- a/xfa/fwl/cfwl_checkbox.cpp +++ b/xfa/fwl/cfwl_checkbox.cpp @@ -72,8 +72,6 @@ void CFWL_CheckBox::DrawWidget(CFX_Graphics* pGraphics, DrawBorder(pGraphics, CFWL_Part::Border, m_pProperties->m_pThemeProvider, pMatrix); } - if (HasEdge()) - DrawEdge(pGraphics, CFWL_Part::Edge, pTheme, pMatrix); int32_t dwStates = GetPartStates(); diff --git a/xfa/fwl/cfwl_combobox.cpp b/xfa/fwl/cfwl_combobox.cpp index 93b595f753..ae49896f09 100644 --- a/xfa/fwl/cfwl_combobox.cpp +++ b/xfa/fwl/cfwl_combobox.cpp @@ -145,8 +145,6 @@ void CFWL_ComboBox::DrawWidget(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider; if (HasBorder()) DrawBorder(pGraphics, CFWL_Part::Border, pTheme, pMatrix); - if (HasEdge()) - DrawEdge(pGraphics, CFWL_Part::Edge, pTheme, pMatrix); if (!IsDropDownStyle()) { CFX_RectF rtTextBk(m_rtClient); diff --git a/xfa/fwl/cfwl_datetimepicker.cpp b/xfa/fwl/cfwl_datetimepicker.cpp index 9e13b18d3b..658cb036dc 100644 --- a/xfa/fwl/cfwl_datetimepicker.cpp +++ b/xfa/fwl/cfwl_datetimepicker.cpp @@ -129,8 +129,6 @@ void CFWL_DateTimePicker::DrawWidget(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider; if (HasBorder()) DrawBorder(pGraphics, CFWL_Part::Border, pTheme, pMatrix); - if (HasEdge()) - DrawEdge(pGraphics, CFWL_Part::Edge, pTheme, pMatrix); if (!m_rtBtn.IsEmpty()) DrawDropDownButton(pGraphics, pTheme, pMatrix); if (m_pWidgetMgr->IsFormDisabled()) { diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp index ecf012e0a0..b0d9e8d222 100644 --- a/xfa/fwl/cfwl_edit.cpp +++ b/xfa/fwl/cfwl_edit.cpp @@ -267,8 +267,6 @@ void CFWL_Edit::DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) { } if (HasBorder()) DrawBorder(pGraphics, CFWL_Part::Border, pTheme, pMatrix); - if (HasEdge()) - DrawEdge(pGraphics, CFWL_Part::Edge, pTheme, pMatrix); } void CFWL_Edit::SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) { diff --git a/xfa/fwl/cfwl_listbox.cpp b/xfa/fwl/cfwl_listbox.cpp index ceea0c7f8e..28888af9af 100644 --- a/xfa/fwl/cfwl_listbox.cpp +++ b/xfa/fwl/cfwl_listbox.cpp @@ -102,8 +102,6 @@ void CFWL_ListBox::DrawWidget(CFX_Graphics* pGraphics, pGraphics->SaveGraphState(); if (HasBorder()) DrawBorder(pGraphics, CFWL_Part::Border, pTheme, pMatrix); - if (HasEdge()) - DrawEdge(pGraphics, CFWL_Part::Edge, pTheme, pMatrix); CFX_RectF rtClip(m_rtConent); if (IsShowScrollBar(false)) diff --git a/xfa/fwl/cfwl_monthcalendar.cpp b/xfa/fwl/cfwl_monthcalendar.cpp index a66d338f85..3b8076bb5f 100644 --- a/xfa/fwl/cfwl_monthcalendar.cpp +++ b/xfa/fwl/cfwl_monthcalendar.cpp @@ -195,8 +195,6 @@ void CFWL_MonthCalendar::DrawWidget(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider; if (HasBorder()) DrawBorder(pGraphics, CFWL_Part::Border, pTheme, pMatrix); - if (HasEdge()) - DrawEdge(pGraphics, CFWL_Part::Edge, pTheme, pMatrix); DrawBackground(pGraphics, pTheme, pMatrix); DrawHeadBK(pGraphics, pTheme, pMatrix); diff --git a/xfa/fwl/cfwl_picturebox.cpp b/xfa/fwl/cfwl_picturebox.cpp index 9c1f033a77..8c200e0494 100644 --- a/xfa/fwl/cfwl_picturebox.cpp +++ b/xfa/fwl/cfwl_picturebox.cpp @@ -42,8 +42,6 @@ void CFWL_PictureBox::DrawWidget(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme = GetAvailableTheme(); if (HasBorder()) DrawBorder(pGraphics, CFWL_Part::Border, pTheme, pMatrix); - if (HasEdge()) - DrawEdge(pGraphics, CFWL_Part::Edge, pTheme, pMatrix); } void CFWL_PictureBox::OnDrawWidget(CFX_Graphics* pGraphics, diff --git a/xfa/fwl/cfwl_pushbutton.cpp b/xfa/fwl/cfwl_pushbutton.cpp index 6f107c3f9e..05f8d256c8 100644 --- a/xfa/fwl/cfwl_pushbutton.cpp +++ b/xfa/fwl/cfwl_pushbutton.cpp @@ -68,10 +68,6 @@ void CFWL_PushButton::DrawWidget(CFX_Graphics* pGraphics, DrawBorder(pGraphics, CFWL_Part::Border, m_pProperties->m_pThemeProvider, pMatrix); } - if (HasEdge()) { - DrawEdge(pGraphics, CFWL_Part::Edge, m_pProperties->m_pThemeProvider, - pMatrix); - } DrawBkground(pGraphics, m_pProperties->m_pThemeProvider, pMatrix); } diff --git a/xfa/fwl/cfwl_scrollbar.cpp b/xfa/fwl/cfwl_scrollbar.cpp index a8e4447263..60876e3135 100644 --- a/xfa/fwl/cfwl_scrollbar.cpp +++ b/xfa/fwl/cfwl_scrollbar.cpp @@ -81,8 +81,6 @@ void CFWL_ScrollBar::DrawWidget(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider; if (HasBorder()) DrawBorder(pGraphics, CFWL_Part::Border, pTheme, pMatrix); - if (HasEdge()) - DrawEdge(pGraphics, CFWL_Part::Edge, pTheme, pMatrix); DrawTrack(pGraphics, pTheme, true, pMatrix); DrawTrack(pGraphics, pTheme, false, pMatrix); DrawArrowBtn(pGraphics, pTheme, true, pMatrix); diff --git a/xfa/fwl/cfwl_spinbutton.cpp b/xfa/fwl/cfwl_spinbutton.cpp index bda168f8d0..3748d36a30 100644 --- a/xfa/fwl/cfwl_spinbutton.cpp +++ b/xfa/fwl/cfwl_spinbutton.cpp @@ -69,8 +69,6 @@ FWL_WidgetHit CFWL_SpinButton::HitTest(FX_FLOAT fx, FX_FLOAT fy) { return FWL_WidgetHit::Client; if (HasBorder() && (m_rtClient.Contains(fx, fy))) return FWL_WidgetHit::Border; - if (HasEdge() && GetEdgeRect().Contains(fx, fy)) - return FWL_WidgetHit::Left; if (m_rtUpButton.Contains(fx, fy)) return FWL_WidgetHit::UpButton; if (m_rtDnButton.Contains(fx, fy)) @@ -90,8 +88,6 @@ void CFWL_SpinButton::DrawWidget(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme = GetAvailableTheme(); if (HasBorder()) DrawBorder(pGraphics, CFWL_Part::Border, pTheme, pMatrix); - if (HasEdge()) - DrawEdge(pGraphics, CFWL_Part::Edge, pTheme, pMatrix); DrawUpButton(pGraphics, pTheme, pMatrix); DrawDownButton(pGraphics, pTheme, pMatrix); diff --git a/xfa/fwl/cfwl_themepart.h b/xfa/fwl/cfwl_themepart.h index 39009878b8..1bb87e9e68 100644 --- a/xfa/fwl/cfwl_themepart.h +++ b/xfa/fwl/cfwl_themepart.h @@ -27,7 +27,6 @@ enum class CFWL_Part { DatesOut, DownButton, DropDownButton, - Edge, ForeArrow, HSeparator, HeadText, diff --git a/xfa/fwl/cfwl_widget.cpp b/xfa/fwl/cfwl_widget.cpp index 4c6eefafda..6c33c7674e 100644 --- a/xfa/fwl/cfwl_widget.cpp +++ b/xfa/fwl/cfwl_widget.cpp @@ -74,10 +74,6 @@ CFX_RectF CFWL_Widget::GetWidgetRect() { } void CFWL_Widget::InflateWidgetRect(CFX_RectF& rect) { - if (HasEdge()) { - FX_FLOAT fEdge = GetEdgeWidth(); - rect.Inflate(fEdge, fEdge); - } if (HasBorder()) { FX_FLOAT fBorder = GetBorderSize(true); rect.Inflate(fBorder, fBorder); @@ -93,12 +89,7 @@ void CFWL_Widget::SetWidgetRect(const CFX_RectF& rect) { } CFX_RectF CFWL_Widget::GetClientRect() { - CFX_RectF rect = GetEdgeRect(); - if (HasEdge()) { - FX_FLOAT fEdge = GetEdgeWidth(); - rect.Deflate(fEdge, fEdge); - } - return rect; + return GetEdgeRect(); } void CFWL_Widget::SetParent(CFWL_Widget* pParent) { @@ -165,8 +156,6 @@ void CFWL_Widget::RemoveStates(uint32_t dwStates) { FWL_WidgetHit CFWL_Widget::HitTest(FX_FLOAT fx, FX_FLOAT fy) { if (GetClientRect().Contains(fx, fy)) return FWL_WidgetHit::Client; - if (HasEdge() && GetEdgeRect().Contains(fx, fy)) - return FWL_WidgetHit::Edge; if (HasBorder() && GetRelativeRect().Contains(fx, fy)) return FWL_WidgetHit::Border; return FWL_WidgetHit::Unknown; @@ -278,10 +267,6 @@ bool CFWL_Widget::HasBorder() const { return !!(m_pProperties->m_dwStyles & FWL_WGTSTYLE_Border); } -bool CFWL_Widget::HasEdge() const { - return false; -} - bool CFWL_Widget::IsVisible() const { return (m_pProperties->m_dwStates & FWL_WGTSTATE_Invisible) == 0; } @@ -322,10 +307,6 @@ FX_FLOAT CFWL_Widget::GetBorderSize(bool bCX) { return *pfBorder; } -FX_FLOAT CFWL_Widget::GetEdgeWidth() { - return 0; -} - CFX_RectF CFWL_Widget::GetRelativeRect() { CFX_RectF rect = m_pProperties->m_rtWidget; rect.left = 0; @@ -612,20 +593,6 @@ void CFWL_Widget::DrawBorder(CFX_Graphics* pGraphics, pTheme->DrawBackground(¶m); } -void CFWL_Widget::DrawEdge(CFX_Graphics* pGraphics, - CFWL_Part iPartEdge, - IFWL_ThemeProvider* pTheme, - const CFX_Matrix* pMatrix) { - CFWL_ThemeBackground param; - param.m_pWidget = this; - param.m_iPart = iPartEdge; - param.m_pGraphics = pGraphics; - if (pMatrix) - param.m_matrix.Concat(*pMatrix, true); - param.m_rtPart = GetEdgeRect(); - pTheme->DrawBackground(¶m); -} - void CFWL_Widget::NotifyDriver() { const CFWL_App* pApp = GetOwnerApp(); if (!pApp) diff --git a/xfa/fwl/cfwl_widget.h b/xfa/fwl/cfwl_widget.h index e2ba4071cb..95cbe3ef2a 100644 --- a/xfa/fwl/cfwl_widget.h +++ b/xfa/fwl/cfwl_widget.h @@ -121,10 +121,8 @@ class CFWL_Widget : public IFWL_WidgetDelegate { bool IsEnabled() const; bool IsLocked() const { return m_iLock > 0; } bool HasBorder() const; - bool HasEdge() const; CFX_RectF GetEdgeRect(); FX_FLOAT GetBorderSize(bool bCX); - FX_FLOAT GetEdgeWidth(); CFX_RectF GetRelativeRect(); void* GetThemeCapacity(CFWL_WidgetCapacity dwCapacity); IFWL_ThemeProvider* GetAvailableTheme(); @@ -148,10 +146,6 @@ class CFWL_Widget : public IFWL_WidgetDelegate { CFWL_Part iPartBorder, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - void DrawEdge(CFX_Graphics* pGraphics, - CFWL_Part iPartEdge, - IFWL_ThemeProvider* pTheme, - const CFX_Matrix* pMatrix); const CFWL_App* const m_pOwnerApp; CFWL_WidgetMgr* const m_pWidgetMgr; diff --git a/xfa/fwl/theme/cfwl_barcodetp.cpp b/xfa/fwl/theme/cfwl_barcodetp.cpp index f123857e51..f0bb22fded 100644 --- a/xfa/fwl/theme/cfwl_barcodetp.cpp +++ b/xfa/fwl/theme/cfwl_barcodetp.cpp @@ -27,11 +27,6 @@ void CFWL_BarcodeTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } case CFWL_Part::Background: { FillBackground(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); diff --git a/xfa/fwl/theme/cfwl_comboboxtp.cpp b/xfa/fwl/theme/cfwl_comboboxtp.cpp index 3e06e665ae..10409a8eeb 100644 --- a/xfa/fwl/theme/cfwl_comboboxtp.cpp +++ b/xfa/fwl/theme/cfwl_comboboxtp.cpp @@ -36,11 +36,6 @@ void CFWL_ComboBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } case CFWL_Part::Background: { CFX_Path path; path.Create(); diff --git a/xfa/fwl/theme/cfwl_datetimepickertp.cpp b/xfa/fwl/theme/cfwl_datetimepickertp.cpp index ef8d0c869b..5c4c86aa21 100644 --- a/xfa/fwl/theme/cfwl_datetimepickertp.cpp +++ b/xfa/fwl/theme/cfwl_datetimepickertp.cpp @@ -26,11 +26,6 @@ void CFWL_DateTimePickerTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } case CFWL_Part::DropDownButton: { DrawDropDownButton(pParams, &pParams->m_matrix); break; diff --git a/xfa/fwl/theme/cfwl_edittp.cpp b/xfa/fwl/theme/cfwl_edittp.cpp index f2fc5cb7a3..5d3447eaa2 100644 --- a/xfa/fwl/theme/cfwl_edittp.cpp +++ b/xfa/fwl/theme/cfwl_edittp.cpp @@ -45,11 +45,6 @@ void CFWL_EditTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } case CFWL_Part::Background: { if (pParams->m_pPath) { CFX_Graphics* pGraphics = pParams->m_pGraphics; diff --git a/xfa/fwl/theme/cfwl_listboxtp.cpp b/xfa/fwl/theme/cfwl_listboxtp.cpp index 6f082a8729..2fc7ba7671 100644 --- a/xfa/fwl/theme/cfwl_listboxtp.cpp +++ b/xfa/fwl/theme/cfwl_listboxtp.cpp @@ -29,11 +29,6 @@ void CFWL_ListBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } case CFWL_Part::Background: { FillSoildRect(pParams->m_pGraphics, ArgbEncode(255, 255, 255, 255), &pParams->m_rtPart, &pParams->m_matrix); diff --git a/xfa/fwl/theme/cfwl_monthcalendartp.cpp b/xfa/fwl/theme/cfwl_monthcalendartp.cpp index 3684e77c66..13fabb34e5 100644 --- a/xfa/fwl/theme/cfwl_monthcalendartp.cpp +++ b/xfa/fwl/theme/cfwl_monthcalendartp.cpp @@ -68,11 +68,6 @@ void CFWL_MonthCalendarTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } case CFWL_Part::Background: { DrawTotalBK(pParams, &pParams->m_matrix); break; diff --git a/xfa/fwl/theme/cfwl_pictureboxtp.cpp b/xfa/fwl/theme/cfwl_pictureboxtp.cpp index 75c60387b4..1d2f2ecd9c 100644 --- a/xfa/fwl/theme/cfwl_pictureboxtp.cpp +++ b/xfa/fwl/theme/cfwl_pictureboxtp.cpp @@ -27,11 +27,6 @@ void CFWL_PictureBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } default: break; } diff --git a/xfa/fwl/theme/cfwl_pushbuttontp.cpp b/xfa/fwl/theme/cfwl_pushbuttontp.cpp index 31f6b7ade1..5515ffb578 100644 --- a/xfa/fwl/theme/cfwl_pushbuttontp.cpp +++ b/xfa/fwl/theme/cfwl_pushbuttontp.cpp @@ -31,11 +31,6 @@ void CFWL_PushButtonTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } case CFWL_Part::Background: { CFX_RectF& rect = pParams->m_rtPart; FX_FLOAT fRight = rect.right(); diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp index 3b436d8302..3867257e0c 100644 --- a/xfa/fwl/theme/cfwl_widgettp.cpp +++ b/xfa/fwl/theme/cfwl_widgettp.cpp @@ -185,31 +185,6 @@ void CFWL_WidgetTP::FinalizeTTO() { m_pTextOut.reset(); } -void CFWL_WidgetTP::DrawEdge(CFX_Graphics* pGraphics, - uint32_t dwStyles, - const CFX_RectF* pRect, - CFX_Matrix* pMatrix) { - if (!pGraphics) - return; - if (!pRect) - return; - pGraphics->SaveGraphState(); - CFX_Color crStroke(ArgbEncode(255, 127, 157, 185)); - pGraphics->SetStrokeColor(&crStroke); - CFX_Path path; - path.Create(); - path.AddRectangle(pRect->left, pRect->top, pRect->width - 1, - pRect->height - 1); - pGraphics->StrokePath(&path, pMatrix); - path.Clear(); - crStroke.Set(ArgbEncode(255, 255, 255, 255)); - pGraphics->SetStrokeColor(&crStroke); - path.AddRectangle(pRect->left + 1, pRect->top + 1, pRect->width - 3, - pRect->height - 3); - pGraphics->StrokePath(&path, pMatrix); - pGraphics->RestoreGraphState(); -} - void CFWL_WidgetTP::Draw3DRect(CFX_Graphics* pGraphics, FWLTHEME_EDGE eType, FX_FLOAT fWidth, diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h index 761cc89415..90d697379c 100644 --- a/xfa/fwl/theme/cfwl_widgettp.h +++ b/xfa/fwl/theme/cfwl_widgettp.h @@ -134,10 +134,6 @@ class CFWL_WidgetTP { void InitTTO(); void FinalizeTTO(); - void DrawEdge(CFX_Graphics* pGraphics, - uint32_t dwStyles, - const CFX_RectF* pRect, - CFX_Matrix* pMatrix = nullptr); void Draw3DRect(CFX_Graphics* pGraphics, FWLTHEME_EDGE eType, FX_FLOAT fWidth, |