- Eliminate extra background fills.
- Eliminate bogus error messages.
This commit is contained in:
parent
457e1ed696
commit
7e1e62de1c
|
@ -2991,7 +2991,6 @@ static void LISTVIEW_DrawSubItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT
|
||||||
LVITEMW lvItem;
|
LVITEMW lvItem;
|
||||||
LVCOLUMNW lvColumn;
|
LVCOLUMNW lvColumn;
|
||||||
UINT textoutOptions = ETO_CLIPPED | ETO_OPAQUE;
|
UINT textoutOptions = ETO_CLIPPED | ETO_OPAQUE;
|
||||||
RECT rcTemp;
|
|
||||||
INT textLeft;
|
INT textLeft;
|
||||||
INT nLabelWidth = 0;
|
INT nLabelWidth = 0;
|
||||||
|
|
||||||
|
@ -3023,16 +3022,6 @@ static void LISTVIEW_DrawSubItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* redraw the background of the item */
|
|
||||||
rcTemp = rcItem;
|
|
||||||
if(infoPtr->nColumnCount == (nSubItem + 1))
|
|
||||||
rcTemp.right = infoPtr->rcList.right;
|
|
||||||
else
|
|
||||||
rcTemp.right += WIDTH_PADDING;
|
|
||||||
|
|
||||||
LISTVIEW_FillBkgnd(infoPtr, hdc, &rcTemp);
|
|
||||||
|
|
||||||
/* set item colors */
|
/* set item colors */
|
||||||
if (ListView_GetItemState(infoPtr->hwndSelf,nItem,LVIS_SELECTED) && Selected)
|
if (ListView_GetItemState(infoPtr->hwndSelf,nItem,LVIS_SELECTED) && Selected)
|
||||||
{
|
{
|
||||||
|
@ -3116,7 +3105,6 @@ static void LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, RECT r
|
||||||
BOOL bImage = FALSE;
|
BOOL bImage = FALSE;
|
||||||
INT iBkMode = -1;
|
INT iBkMode = -1;
|
||||||
UINT textoutOptions = ETO_OPAQUE | ETO_CLIPPED;
|
UINT textoutOptions = ETO_OPAQUE | ETO_CLIPPED;
|
||||||
RECT rcTemp;
|
|
||||||
|
|
||||||
TRACE("(hdc=%x, nItem=%d)\n", hdc, nItem);
|
TRACE("(hdc=%x, nItem=%d)\n", hdc, nItem);
|
||||||
|
|
||||||
|
@ -3131,15 +3119,6 @@ static void LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, RECT r
|
||||||
LISTVIEW_GetItemW(infoPtr, &lvItem, TRUE);
|
LISTVIEW_GetItemW(infoPtr, &lvItem, TRUE);
|
||||||
TRACE(" lvItem=%s\n", debuglvitem_t(&lvItem, TRUE));
|
TRACE(" lvItem=%s\n", debuglvitem_t(&lvItem, TRUE));
|
||||||
|
|
||||||
/* redraw the background of the item */
|
|
||||||
rcTemp = rcItem;
|
|
||||||
if(infoPtr->nColumnCount == (nItem + 1))
|
|
||||||
rcTemp.right = infoPtr->rcList.right;
|
|
||||||
else
|
|
||||||
rcTemp.right+=WIDTH_PADDING;
|
|
||||||
|
|
||||||
LISTVIEW_FillBkgnd(infoPtr, hdc, &rcTemp);
|
|
||||||
|
|
||||||
/* do indent */
|
/* do indent */
|
||||||
if (lvItem.iIndent>0 && infoPtr->iconSize.cx > 0)
|
if (lvItem.iIndent>0 && infoPtr->iconSize.cx > 0)
|
||||||
{
|
{
|
||||||
|
@ -3322,8 +3301,6 @@ static void LISTVIEW_DrawLargeItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, R
|
||||||
TRACE("background rect (%d,%d)-(%d,%d)\n",
|
TRACE("background rect (%d,%d)-(%d,%d)\n",
|
||||||
rcFill.left, rcFill.top, rcFill.right, rcFill.bottom);
|
rcFill.left, rcFill.top, rcFill.right, rcFill.bottom);
|
||||||
|
|
||||||
LISTVIEW_FillBkgnd(infoPtr, hdc, &rcFill);
|
|
||||||
|
|
||||||
/* Set the item to the boundary box for now */
|
/* Set the item to the boundary box for now */
|
||||||
rcItem = rcFill;
|
rcItem = rcFill;
|
||||||
TRACE("bound box for text+icon (%d,%d)-(%d,%d), iS.cx=%ld, nItemWidth=%d\n",
|
TRACE("bound box for text+icon (%d,%d)-(%d,%d), iS.cx=%ld, nItemWidth=%d\n",
|
||||||
|
@ -4611,10 +4588,6 @@ static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *infoPtr, INT nItem, BOOL bPart
|
||||||
nScrollPosHeight = 1;
|
nScrollPosHeight = 1;
|
||||||
rcItem.top += infoPtr->rcList.top;
|
rcItem.top += infoPtr->rcList.top;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
ERR("LVS_LIST top unknown, nScrollPosWidth=%d\n", nScrollPosWidth);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nScrollPosHeight)
|
if (nScrollPosHeight)
|
||||||
{
|
{
|
||||||
|
@ -4643,10 +4616,6 @@ static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *infoPtr, INT nItem, BOOL bPart
|
||||||
nScrollPosHeight = 1;
|
nScrollPosHeight = 1;
|
||||||
rcItem.bottom -= infoPtr->rcList.bottom;
|
rcItem.bottom -= infoPtr->rcList.bottom;
|
||||||
}
|
}
|
||||||
else /* LVS_LIST */
|
|
||||||
{
|
|
||||||
ERR("LVS_LIST bottom unknown, nScrollPosWidth=%d\n", nScrollPosWidth);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nScrollPosHeight)
|
if (nScrollPosHeight)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue