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

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

Issue 2525003002: Remove IFWL_CombobBox::DataProvider (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.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fwl/core/ifwl_combobox.cpp
diff --git a/xfa/fwl/core/ifwl_combobox.cpp b/xfa/fwl/core/ifwl_combobox.cpp
index 906fe1d6efe7654c3786badab9f842b8fb24744f..19d1c3f87fe5663a619bbdca13d2b863f4cf227d 100644
--- a/xfa/fwl/core/ifwl_combobox.cpp
+++ b/xfa/fwl/core/ifwl_combobox.cpp
@@ -337,12 +337,6 @@ void IFWL_ComboBox::EditModifyStylesEx(uint32_t dwStylesExAdded,
m_pEdit->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
}
-FX_FLOAT IFWL_ComboBox::GetDataProviderListHeight() {
- return static_cast<IFWL_ComboBox::DataProvider*>(
- m_pProperties->m_pDataProvider)
- ->GetListHeight(this);
-}
-
void IFWL_ComboBox::DrawStretchHandler(CFX_Graphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeBackground param;
@@ -381,11 +375,6 @@ void IFWL_ComboBox::ShowDropList(bool bActivate) {
(FWL_STYLEEXT_CMB_Sort | FWL_STYLEEXT_CMB_OwnerDraw);
m_pListBox->ModifyStylesEx(dwStyleAdd, 0);
m_pListBox->GetWidgetRect(m_rtList, true);
- FX_FLOAT fHeight = GetDataProviderListHeight();
- if (fHeight > 0 && m_rtList.height > fHeight) {
- m_rtList.height = fHeight;
- m_pListBox->ModifyStyles(FWL_WGTSTYLE_VScroll, 0);
- }
CFX_RectF rtAnchor;
rtAnchor.Set(0, 0, m_pProperties->m_rtWidget.width,
@@ -396,8 +385,7 @@ void IFWL_ComboBox::ShowDropList(bool bActivate) {
if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_CMB_ListDrag)
m_rtProxy.height += m_fComboFormHandler;
- FX_FLOAT fMinHeight = 0;
- GetPopupPos(fMinHeight, m_rtProxy.height, rtAnchor, m_rtProxy);
+ GetPopupPos(0, m_rtProxy.height, rtAnchor, m_rtProxy);
if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_CMB_ListDrag) {
FX_FLOAT fx = 0;
FX_FLOAT fy = m_rtClient.top + m_rtClient.height / 2;
« no previous file with comments | « xfa/fwl/core/ifwl_combobox.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698