xfa/fwl/basewidget/fwl_listboximp.cpp - Issue 1950973003: Cleanup CFWL_ThemePart data.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: xfa/fwl/basewidget/fwl_listboximp.cpp

Issue 1950973003: Cleanup CFWL_ThemePart data. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Created 4 years, 7 months 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

Index: xfa/fwl/basewidget/fwl_listboximp.cpp

diff --git a/xfa/fwl/basewidget/fwl_listboximp.cpp b/xfa/fwl/basewidget/fwl_listboximp.cpp

index dd017e215ff5741351aa9e54ee4711ee4c2941c8..a7aeec077c79007f362de5ecedccb594ffaaa501 100644

--- a/xfa/fwl/basewidget/fwl_listboximp.cpp

+++ b/xfa/fwl/basewidget/fwl_listboximp.cpp

@@ -636,9 +636,6 @@ void CFWL_ListBoxImp::DrawItem(CFX_Graphics* pGraphics,

dwItemStyles & FWL_ITEMSTATE_LTB_Focused) {

dwPartStates |= CFWL_PartState_Focused;

}

- FWL_ListBoxItemData itemData;

- itemData.pDataProvider = pData;

- itemData.iIndex = Index;

{

CFWL_ThemeBackground param;

param.m_pWidget = m_pInterface;

@@ -647,7 +644,6 @@ void CFWL_ListBoxImp::DrawItem(CFX_Graphics* pGraphics,

param.m_pGraphics = pGraphics;

param.m_matrix.Concat(*pMatrix);

param.m_rtPart = rtItem;

- param.m_dwData = (uint32_t)(uintptr_t)(&itemData);

dsinclair 2016/05/04 16:31:01 This strikes me as a bad idea given that itemData

CFX_RectF rtFocus(rtItem);

param.m_pData = &rtFocus;

if (m_pVertScrollBar && !m_pHorzScrollBar &&

@@ -671,7 +667,6 @@ void CFWL_ListBoxImp::DrawItem(CFX_Graphics* pGraphics,

param.m_pGraphics = pGraphics;

param.m_matrix.Concat(*pMatrix);

param.m_rtPart = rtDIB;

- param.m_dwData = (uint32_t)(uintptr_t)(&itemData);

param.m_pImage = pDib;

pTheme->DrawBackground(&param);

}

@@ -693,7 +688,6 @@ void CFWL_ListBoxImp::DrawItem(CFX_Graphics* pGraphics,

}

param.m_matrix.Concat(*pMatrix);

param.m_rtPart = rtCheck;

- param.m_dwData = (uint32_t)(uintptr_t)(&itemData);

pTheme->DrawBackground(&param);

}

CFX_WideString wsText;

@@ -716,7 +710,6 @@ void CFWL_ListBoxImp::DrawItem(CFX_Graphics* pGraphics,

textParam.m_wsText = wsText;

textParam.m_dwTTOStyles = m_dwTTOStyles;

textParam.m_iTTOAlign = m_iTTOAligns;

- textParam.m_dwData = (uint32_t)(uintptr_t)(&itemData);

pTheme->DrawText(&textParam);

}

@@ -750,7 +743,6 @@ CFX_SizeF CFWL_ListBoxImp::CalcSize(FX_BOOL bAutoSize) {

itemPart.m_pWidget = m_pInterface;

itemPart.m_iPart = CFWL_Part::ListItem;

itemPart.m_pData = m_pProperties->m_pDataProvider;

- itemPart.m_dwData = i;

CFX_RectF r;

m_pProperties->m_pThemeProvider->GetPartRect(&itemPart, r);

if (!bAutoSize) {

« no previous file with comments | « xfa/fwl/basewidget/fwl_editimp.cpp ('k') | xfa/fwl/basewidget/ifwl_edit.h » ('j') | xfa/fwl/theme/cfwl_formtp.cpp » ('J')