ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32: Use wine_dbgstr_rect() to trace RECTs.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-04-19 13:07:16 +03:00 committed by Alexandre Julliard
parent ffa13a856b
commit 935db97c24
3 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/comctl32/pager.c
View File

@ -665,13 +665,8 @@ PAGER_NCCalcSize(PAGER_INFO* infoPtr, WPARAM wParam, LPRECT lpRect)
lpRect->bottom -= infoPtr->nButtonSize; lpRect->bottom -= infoPtr->nButtonSize;
} }
TRACE("nPos=%d, nHeight=%d, window=%s\n", TRACE("nPos=%d, nHeight=%d, window=%s\n", infoPtr->nPos, infoPtr->nHeight, wine_dbgstr_rect(&rcWindow));
infoPtr->nPos, infoPtr->nHeight, TRACE("[%p] client rect set to %s BtnState[%d,%d]\n", infoPtr->hwndSelf, wine_dbgstr_rect(lpRect),
wine_dbgstr_rect(&rcWindow));
TRACE("[%p] client rect set to %dx%d at (%d,%d) BtnState[%d,%d]\n",
infoPtr->hwndSelf, lpRect->right-lpRect->left, lpRect->bottom-lpRect->top,
lpRect->left, lpRect->top,
infoPtr->TLbtnState, infoPtr->BRbtnState); infoPtr->TLbtnState, infoPtr->BRbtnState);
return 0; return 0;

12
dlls/comctl32/rebar.c
View File

@ -806,15 +806,11 @@ REBAR_CalcHorzBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend)
/* flag if notify required and invalidate rectangle */ /* flag if notify required and invalidate rectangle */
if (lpBand->fDraw & NTF_INVALIDATE) { if (lpBand->fDraw & NTF_INVALIDATE) {
TRACE("invalidating (%d,%d)-(%d,%d)\n",
lpBand->rcBand.left,
lpBand->rcBand.top,
lpBand->rcBand.right + SEP_WIDTH,
lpBand->rcBand.bottom + SEP_WIDTH);
lpBand->fDraw &= ~NTF_INVALIDATE; lpBand->fDraw &= ~NTF_INVALIDATE;
work = lpBand->rcBand; work = lpBand->rcBand;
work.right += SEP_WIDTH; work.right += SEP_WIDTH;
work.bottom += SEP_WIDTH; work.bottom += SEP_WIDTH;
TRACE("invalidating %s\n", wine_dbgstr_rect(&work));
InvalidateRect(infoPtr->hwndSelf, &work, TRUE); InvalidateRect(infoPtr->hwndSelf, &work, TRUE);
if (lpBand->hwndChild) InvalidateRect(lpBand->hwndChild, NULL, TRUE); if (lpBand->hwndChild) InvalidateRect(lpBand->hwndChild, NULL, TRUE);
} }
@ -927,15 +923,11 @@ REBAR_CalcVertBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend)
} }
if (lpBand->fDraw & NTF_INVALIDATE) { if (lpBand->fDraw & NTF_INVALIDATE) {
TRACE("invalidating (%d,%d)-(%d,%d)\n",
rcBand.left,
rcBand.top,
rcBand.right + SEP_WIDTH,
rcBand.bottom + SEP_WIDTH);
lpBand->fDraw &= ~NTF_INVALIDATE; lpBand->fDraw &= ~NTF_INVALIDATE;
work = rcBand; work = rcBand;
work.bottom += SEP_WIDTH; work.bottom += SEP_WIDTH;
work.right += SEP_WIDTH; work.right += SEP_WIDTH;
TRACE("invalidating %s\n", wine_dbgstr_rect(&work));
InvalidateRect(infoPtr->hwndSelf, &work, TRUE); InvalidateRect(infoPtr->hwndSelf, &work, TRUE);
if (lpBand->hwndChild) InvalidateRect(lpBand->hwndChild, NULL, TRUE); if (lpBand->hwndChild) InvalidateRect(lpBand->hwndChild, NULL, TRUE);
} }

20
dlls/comctl32/tab.c
View File

@ -1243,8 +1243,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr)
tabwidth = max(tabwidth, infoPtr->tabMinWidth); tabwidth = max(tabwidth, infoPtr->tabMinWidth);
curr->rect.right = curr->rect.left + tabwidth; curr->rect.right = curr->rect.left + tabwidth;
TRACE("for <%s>, l,r=%d,%d\n", TRACE("for <%s>, rect %s\n", debugstr_w(curr->pszText), wine_dbgstr_rect(&curr->rect));
debugstr_w(curr->pszText), curr->rect.left, curr->rect.right);
} }
/* /*
@ -1263,8 +1262,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr)
curr->rect.left = 0; curr->rect.left = 0;
curItemRowCount++; curItemRowCount++;
TRACE("wrapping <%s>, l,r=%d,%d\n", debugstr_w(curr->pszText), TRACE("wrapping <%s>, rect %s\n", debugstr_w(curr->pszText), wine_dbgstr_rect(&curr->rect));
curr->rect.left, curr->rect.right);
} }
curr->rect.bottom = 0; curr->rect.bottom = 0;
@ -1377,9 +1375,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr)
else else
curItemLeftPos = curr->rect.right; curItemLeftPos = curr->rect.right;
TRACE("arranging <%s>, l,r=%d,%d, row=%d\n", TRACE("arranging <%s>, rect %s\n", debugstr_w(curr->pszText), wine_dbgstr_rect(&curr->rect));
debugstr_w(curr->pszText), curr->rect.left,
curr->rect.right, curr->rect.top);
} }
/* /*
@ -1429,9 +1425,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr)
item->rect.left += iCount * widthDiff; item->rect.left += iCount * widthDiff;
item->rect.right += (iCount + 1) * widthDiff; item->rect.right += (iCount + 1) * widthDiff;
TRACE("adjusting 1 <%s>, l,r=%d,%d\n", TRACE("adjusting 1 <%s>, rect %s\n", debugstr_w(item->pszText), wine_dbgstr_rect(&item->rect));
debugstr_w(item->pszText),
item->rect.left, item->rect.right);
} }
TAB_GetItem(infoPtr, iIndex - 1)->rect.right += remainder; TAB_GetItem(infoPtr, iIndex - 1)->rect.right += remainder;
@ -1441,13 +1435,9 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr)
start->rect.left = clientRect.left; start->rect.left = clientRect.left;
start->rect.right = clientRect.right - 4; start->rect.right = clientRect.right - 4;
TRACE("adjusting 2 <%s>, l,r=%d,%d\n", TRACE("adjusting 2 <%s>, rect %s\n", debugstr_w(start->pszText), wine_dbgstr_rect(&start->rect));
debugstr_w(start->pszText),
start->rect.left, start->rect.right);
} }
iIndexStart = iIndexEnd; iIndexStart = iIndexEnd;
} }
} }