Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(983)

Unified Diff: xfa/fwl/core/ifwl_combolist.cpp

Issue 2492563002: Continue IFWL cleanup (Closed)
Patch Set: Rebase to master Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/fwl/core/ifwl_combobox.cpp ('k') | xfa/fwl/core/ifwl_formproxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fwl/core/ifwl_combolist.cpp
diff --git a/xfa/fwl/core/ifwl_combolist.cpp b/xfa/fwl/core/ifwl_combolist.cpp
index 535ed68d6214b960592ef85db85821cbc89549a8..d021088ebbdb2540a6feaa019be6e50d4455ea2a 100644
--- a/xfa/fwl/core/ifwl_combolist.cpp
+++ b/xfa/fwl/core/ifwl_combolist.cpp
@@ -103,13 +103,14 @@ void IFWL_ComboList::OnProcessMessage(CFWL_Message* pMessage) {
OnDropListFocusChanged(pMessage, dwHashCode == CFWL_MessageType::SetFocus);
} else if (dwHashCode == CFWL_MessageType::Mouse) {
CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
- if (IsShowScrollBar(true) && m_pVertScrollBar) {
+ IFWL_ScrollBar* vertSB = GetVertScrollBar();
+ if (IsShowScrollBar(true) && vertSB) {
CFX_RectF rect;
- m_pVertScrollBar->GetWidgetRect(rect);
+ vertSB->GetWidgetRect(rect);
if (rect.Contains(pMsg->m_fx, pMsg->m_fy)) {
pMsg->m_fx -= rect.left;
pMsg->m_fy -= rect.top;
- m_pVertScrollBar->GetDelegate()->OnProcessMessage(pMsg);
+ vertSB->GetDelegate()->OnProcessMessage(pMsg);
return;
}
}
@@ -152,13 +153,14 @@ void IFWL_ComboList::OnDropListFocusChanged(CFWL_Message* pMsg, bool bSet) {
}
int32_t IFWL_ComboList::OnDropListMouseMove(CFWL_MsgMouse* pMsg) {
- if (m_rtClient.Contains(pMsg->m_fx, pMsg->m_fy)) {
+ if (GetRTClient().Contains(pMsg->m_fx, pMsg->m_fy)) {
if (m_bNotifyOwner) {
m_bNotifyOwner = false;
}
- if (IsShowScrollBar(true) && m_pVertScrollBar) {
+ IFWL_ScrollBar* vertSB = GetVertScrollBar();
+ if (IsShowScrollBar(true) && vertSB) {
CFX_RectF rect;
- m_pVertScrollBar->GetWidgetRect(rect);
+ vertSB->GetWidgetRect(rect);
if (rect.Contains(pMsg->m_fx, pMsg->m_fy)) {
return 1;
}
@@ -185,7 +187,7 @@ int32_t IFWL_ComboList::OnDropListMouseMove(CFWL_MsgMouse* pMsg) {
}
int32_t IFWL_ComboList::OnDropListLButtonDown(CFWL_MsgMouse* pMsg) {
- if (m_rtClient.Contains(pMsg->m_fx, pMsg->m_fy))
+ if (GetRTClient().Contains(pMsg->m_fx, pMsg->m_fy))
return 0;
IFWL_ComboBox* pOuter = static_cast<IFWL_ComboBox*>(m_pOuter);
@@ -199,9 +201,10 @@ int32_t IFWL_ComboList::OnDropListLButtonUp(CFWL_MsgMouse* pMsg) {
ClientToOuter(pMsg->m_fx, pMsg->m_fy);
pOuter->GetDelegate()->OnProcessMessage(pMsg);
} else {
- if (IsShowScrollBar(true) && m_pVertScrollBar) {
+ IFWL_ScrollBar* vertSB = GetVertScrollBar();
+ if (IsShowScrollBar(true) && vertSB) {
CFX_RectF rect;
- m_pVertScrollBar->GetWidgetRect(rect);
+ vertSB->GetWidgetRect(rect);
if (rect.Contains(pMsg->m_fx, pMsg->m_fy)) {
return 1;
}
« no previous file with comments | « xfa/fwl/core/ifwl_combobox.cpp ('k') | xfa/fwl/core/ifwl_formproxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698