summaryrefslogtreecommitdiff
path: root/xfa/fwl
diff options
context:
space:
mode:
authorHenrique Nakashima <hnakashima@chromium.org>2018-05-11 21:02:46 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-05-11 21:02:46 +0000
commit69594dd17edac7fbd2ac57f9eec24d54f676b8bc (patch)
tree656e16fc0a0b0b3ed67dd13bb651c39f39e1c954 /xfa/fwl
parentd6cdd0dd2e61ecbdc652f72f84658b8502d83703 (diff)
downloadpdfium-69594dd17edac7fbd2ac57f9eec24d54f676b8bc.tar.xz
Remove more dead code from CFWL_ComboBox.
The methods removed are not called anymore, and the members removed then become unused too. Change-Id: I5832f801a678f6907faf623ac678f9b3818c2af7 Reviewed-on: https://pdfium-review.googlesource.com/32394 Commit-Queue: Henrique Nakashima <hnakashima@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fwl')
-rw-r--r--xfa/fwl/cfwl_combobox.cpp122
-rw-r--r--xfa/fwl/cfwl_combobox.h11
2 files changed, 0 insertions, 133 deletions
diff --git a/xfa/fwl/cfwl_combobox.cpp b/xfa/fwl/cfwl_combobox.cpp
index f6fae087e3..6489e9e894 100644
--- a/xfa/fwl/cfwl_combobox.cpp
+++ b/xfa/fwl/cfwl_combobox.cpp
@@ -32,7 +32,6 @@
CFWL_ComboBox::CFWL_ComboBox(const CFWL_App* app)
: CFWL_Widget(app, pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr),
- m_bLButtonDown(false),
m_iCurSel(-1),
m_iBtnState(CFWL_PartState_Normal) {
InitComboList();
@@ -226,7 +225,6 @@ void CFWL_ComboBox::DrawStretchHandler(CXFA_Graphics* pGraphics,
param.m_pWidget = this;
if (pMatrix)
param.m_matrix.Concat(*pMatrix);
- param.m_rtPart = m_rtHandler;
m_pProperties->m_pThemeProvider->DrawBackground(&param);
}
@@ -519,54 +517,7 @@ void CFWL_ComboBox::OnDrawWidget(CXFA_Graphics* pGraphics,
DrawWidget(pGraphics, matrix);
}
-void CFWL_ComboBox::OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
- if (bSet) {
- m_pProperties->m_dwStates |= FWL_WGTSTATE_Focused;
- if (IsDropDownStyle() && pMsg->m_pSrcTarget != m_pListBox.get()) {
- if (!m_pEdit)
- return;
- m_pEdit->SetSelected();
- return;
- }
-
- RepaintRect(m_rtClient);
- return;
- }
-
- m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Focused;
- if (!IsDropDownStyle() || pMsg->m_pDstTarget == m_pListBox.get()) {
- RepaintRect(m_rtClient);
- return;
- }
- if (!m_pEdit)
- return;
-
- m_pEdit->FlagFocus(false);
- m_pEdit->ClearSelected();
-}
-
-void CFWL_ComboBox::OnLButtonDown(CFWL_MessageMouse* pMsg) {
- if (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled)
- return;
-
- CFX_RectF& rtBtn = IsDropDownStyle() ? m_rtBtn : m_rtClient;
- if (!rtBtn.Contains(pMsg->m_pos))
- return;
-
- if (IsDropDownStyle() && m_pEdit)
- MatchEditText();
-
- m_bLButtonDown = true;
- m_iBtnState = CFWL_PartState_Pressed;
- RepaintRect(m_rtClient);
-
- ShowDropList(true);
- m_iBtnState = CFWL_PartState_Normal;
- RepaintRect(m_rtClient);
-}
-
void CFWL_ComboBox::OnLButtonUp(CFWL_MessageMouse* pMsg) {
- m_bLButtonDown = false;
if (m_rtBtn.Contains(pMsg->m_pos))
m_iBtnState = CFWL_PartState_Hovered;
else
@@ -575,79 +526,6 @@ void CFWL_ComboBox::OnLButtonUp(CFWL_MessageMouse* pMsg) {
RepaintRect(m_rtBtn);
}
-void CFWL_ComboBox::OnMouseMove(CFWL_MessageMouse* pMsg) {
- int32_t iOldState = m_iBtnState;
- if (m_rtBtn.Contains(pMsg->m_pos)) {
- m_iBtnState =
- m_bLButtonDown ? CFWL_PartState_Pressed : CFWL_PartState_Hovered;
- } else {
- m_iBtnState = CFWL_PartState_Normal;
- }
- if ((iOldState != m_iBtnState) &&
- !((m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled) ==
- FWL_WGTSTATE_Disabled)) {
- RepaintRect(m_rtBtn);
- }
-}
-
-void CFWL_ComboBox::OnMouseLeave(CFWL_MessageMouse* pMsg) {
- if (!((m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled) ==
- FWL_WGTSTATE_Disabled)) {
- m_iBtnState = CFWL_PartState_Normal;
- RepaintRect(m_rtBtn);
- }
-}
-
-void CFWL_ComboBox::OnKey(CFWL_MessageKey* pMsg) {
- uint32_t dwKeyCode = pMsg->m_dwKeyCode;
- if (dwKeyCode == FWL_VKEY_Tab)
- return;
- if (pMsg->m_pDstTarget == this)
- DoSubCtrlKey(pMsg);
-}
-
-void CFWL_ComboBox::DoSubCtrlKey(CFWL_MessageKey* pMsg) {
- uint32_t dwKeyCode = pMsg->m_dwKeyCode;
- const bool bUp = dwKeyCode == FWL_VKEY_Up;
- const bool bDown = dwKeyCode == FWL_VKEY_Down;
- if (bUp || bDown) {
- int32_t iCount = m_pListBox->CountItems(nullptr);
- if (iCount < 1)
- return;
-
- bool bMatchEqual = false;
- int32_t iCurSel = m_iCurSel;
- bool bDropDown = IsDropDownStyle();
- if (bDropDown && m_pEdit) {
- WideString wsText = m_pEdit->GetText();
- iCurSel = m_pListBox->MatchItem(wsText);
- if (iCurSel >= 0) {
- CFWL_ListItem* hItem = m_pListBox->GetItem(this, iCurSel);
- bMatchEqual = wsText == (hItem ? hItem->GetText() : L"");
- }
- }
- if (iCurSel < 0) {
- iCurSel = 0;
- } else if (!bDropDown || bMatchEqual) {
- if ((bUp && iCurSel == 0) || (bDown && iCurSel == iCount - 1))
- return;
- if (bUp)
- iCurSel--;
- else
- iCurSel++;
- }
- m_iCurSel = iCurSel;
- if (bDropDown && m_pEdit)
- SyncEditText(m_iCurSel);
- else
- RepaintRect(m_rtClient);
- return;
- }
-
- if (IsDropDownStyle())
- m_pEdit->GetDelegate()->OnProcessMessage(pMsg);
-}
-
void CFWL_ComboBox::DisForm_OnLButtonDown(CFWL_MessageMouse* pMsg) {
bool bDropDown = IsDropListVisible();
CFX_RectF& rtBtn = bDropDown ? m_rtBtn : m_rtClient;
diff --git a/xfa/fwl/cfwl_combobox.h b/xfa/fwl/cfwl_combobox.h
index a1666f49b1..500c166cc3 100644
--- a/xfa/fwl/cfwl_combobox.h
+++ b/xfa/fwl/cfwl_combobox.h
@@ -113,14 +113,7 @@ class CFWL_ComboBox : public CFWL_Widget {
float fMaxHeight,
const CFX_RectF& rtAnchor,
CFX_RectF* pPopupRect);
-
- void OnFocusChanged(CFWL_Message* pMsg, bool bSet);
- void OnLButtonDown(CFWL_MessageMouse* pMsg);
void OnLButtonUp(CFWL_MessageMouse* pMsg);
- void OnMouseMove(CFWL_MessageMouse* pMsg);
- void OnMouseLeave(CFWL_MessageMouse* pMsg);
- void OnKey(CFWL_MessageKey* pMsg);
- void DoSubCtrlKey(CFWL_MessageKey* pMsg);
void InitComboList();
void InitComboEdit();
@@ -134,12 +127,8 @@ class CFWL_ComboBox : public CFWL_Widget {
CFX_RectF m_rtClient;
CFX_RectF m_rtContent;
CFX_RectF m_rtBtn;
- CFX_RectF m_rtList;
- CFX_RectF m_rtProxy;
- CFX_RectF m_rtHandler;
std::unique_ptr<CFWL_ComboEdit> m_pEdit;
std::unique_ptr<CFWL_ComboList> m_pListBox;
- bool m_bLButtonDown;
int32_t m_iCurSel;
int32_t m_iBtnState;
};