Fix indentation for consistency with the rest of the file.
This commit is contained in:
parent
4c5832ba65
commit
5dfdd18abc
@ -162,28 +162,24 @@ STATUSBAR_DrawPart (STATUS_INFO *infoPtr, HDC hdc, STATUSWINDOWPART *part, int i
|
|||||||
|
|
||||||
DrawEdge(hdc, &r, border, BF_RECT|BF_ADJUST);
|
DrawEdge(hdc, &r, border, BF_RECT|BF_ADJUST);
|
||||||
|
|
||||||
if (part->style & SBT_OWNERDRAW)
|
if (part->style & SBT_OWNERDRAW) {
|
||||||
{
|
DRAWITEMSTRUCT dis;
|
||||||
DRAWITEMSTRUCT dis;
|
|
||||||
|
|
||||||
dis.CtlID = GetWindowLongPtrW (infoPtr->Self, GWLP_ID);
|
dis.CtlID = GetWindowLongPtrW (infoPtr->Self, GWLP_ID);
|
||||||
dis.itemID = itemID;
|
dis.itemID = itemID;
|
||||||
dis.hwndItem = infoPtr->Self;
|
dis.hwndItem = infoPtr->Self;
|
||||||
dis.hDC = hdc;
|
dis.hDC = hdc;
|
||||||
dis.rcItem = r;
|
dis.rcItem = r;
|
||||||
dis.itemData = (INT)part->text;
|
dis.itemData = (INT)part->text;
|
||||||
SendMessageW (infoPtr->Notify, WM_DRAWITEM, (WPARAM)dis.CtlID, (LPARAM)&dis);
|
SendMessageW (infoPtr->Notify, WM_DRAWITEM, (WPARAM)dis.CtlID, (LPARAM)&dis);
|
||||||
}
|
} else {
|
||||||
else
|
if (part->hIcon) {
|
||||||
{
|
INT cy = r.bottom - r.top;
|
||||||
if (part->hIcon)
|
|
||||||
{
|
|
||||||
INT cy = r.bottom - r.top;
|
|
||||||
|
|
||||||
r.left += 2;
|
r.left += 2;
|
||||||
DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL);
|
DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL);
|
||||||
r.left += cy;
|
r.left += cy;
|
||||||
}
|
}
|
||||||
DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS);
|
DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -216,12 +212,11 @@ STATUSBAR_RefreshPart (STATUS_INFO *infoPtr, HDC hdc, STATUSWINDOWPART *part, in
|
|||||||
if (infoPtr->clrBk != CLR_DEFAULT)
|
if (infoPtr->clrBk != CLR_DEFAULT)
|
||||||
DeleteObject (hbrBk);
|
DeleteObject (hbrBk);
|
||||||
|
|
||||||
if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP)
|
if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) {
|
||||||
{
|
RECT rect;
|
||||||
RECT rect;
|
|
||||||
|
|
||||||
GetClientRect (infoPtr->Self, &rect);
|
GetClientRect (infoPtr->Self, &rect);
|
||||||
STATUSBAR_DrawSizeGrip (hdc, &rect);
|
STATUSBAR_DrawSizeGrip (hdc, &rect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -243,19 +238,19 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc)
|
|||||||
GetClientRect (infoPtr->Self, &rect);
|
GetClientRect (infoPtr->Self, &rect);
|
||||||
|
|
||||||
if (infoPtr->clrBk != CLR_DEFAULT)
|
if (infoPtr->clrBk != CLR_DEFAULT)
|
||||||
hbrBk = CreateSolidBrush (infoPtr->clrBk);
|
hbrBk = CreateSolidBrush (infoPtr->clrBk);
|
||||||
else
|
else
|
||||||
hbrBk = GetSysColorBrush (COLOR_3DFACE);
|
hbrBk = GetSysColorBrush (COLOR_3DFACE);
|
||||||
FillRect(hdc, &rect, hbrBk);
|
FillRect(hdc, &rect, hbrBk);
|
||||||
|
|
||||||
hOldFont = SelectObject (hdc, infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont);
|
hOldFont = SelectObject (hdc, infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont);
|
||||||
|
|
||||||
if (infoPtr->simple) {
|
if (infoPtr->simple) {
|
||||||
STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->part0, 0);
|
STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->part0, 0);
|
||||||
} else {
|
} else {
|
||||||
for (i = 0; i < infoPtr->numParts; i++) {
|
for (i = 0; i < infoPtr->numParts; i++) {
|
||||||
STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->parts[i], i);
|
STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->parts[i], i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SelectObject (hdc, hOldFont);
|
SelectObject (hdc, hOldFont);
|
||||||
@ -582,8 +577,8 @@ STATUSBAR_SetMinHeight (STATUS_INFO *infoPtr, INT height)
|
|||||||
x = parent_rect.left;
|
x = parent_rect.left;
|
||||||
y = parent_rect.bottom - infoPtr->height;
|
y = parent_rect.bottom - infoPtr->height;
|
||||||
MoveWindow (infoPtr->Self, parent_rect.left,
|
MoveWindow (infoPtr->Self, parent_rect.left,
|
||||||
parent_rect.bottom - infoPtr->height,
|
parent_rect.bottom - infoPtr->height,
|
||||||
width, infoPtr->height, TRUE);
|
width, infoPtr->height, TRUE);
|
||||||
STATUSBAR_SetPartBounds (infoPtr);
|
STATUSBAR_SetPartBounds (infoPtr);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -745,8 +740,7 @@ STATUSBAR_SetTipTextA (STATUS_INFO *infoPtr, INT id, LPSTR text)
|
|||||||
ti.uId = id;
|
ti.uId = id;
|
||||||
ti.hinst = 0;
|
ti.hinst = 0;
|
||||||
ti.lpszText = text;
|
ti.lpszText = text;
|
||||||
SendMessageA (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTA,
|
SendMessageA (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTA, 0, (LPARAM)&ti);
|
||||||
0, (LPARAM)&ti);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@ -764,8 +758,7 @@ STATUSBAR_SetTipTextW (STATUS_INFO *infoPtr, INT id, LPWSTR text)
|
|||||||
ti.uId = id;
|
ti.uId = id;
|
||||||
ti.hinst = 0;
|
ti.hinst = 0;
|
||||||
ti.lpszText = text;
|
ti.lpszText = text;
|
||||||
SendMessageW (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTW,
|
SendMessageW (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTW, 0, (LPARAM)&ti);
|
||||||
0, (LPARAM)&ti);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@ -1089,8 +1082,7 @@ STATUSBAR_WMSize (STATUS_INFO *infoPtr, WORD flags)
|
|||||||
/* Need to resize width to match parent */
|
/* Need to resize width to match parent */
|
||||||
TRACE("flags %04x\n", flags);
|
TRACE("flags %04x\n", flags);
|
||||||
|
|
||||||
if (flags != SIZE_RESTORED && flags != SIZE_MAXIMIZED)
|
if (flags != SIZE_RESTORED && flags != SIZE_MAXIMIZED) {
|
||||||
{
|
|
||||||
WARN("flags MUST be SIZE_RESTORED or SIZE_MAXIMIZED\n");
|
WARN("flags MUST be SIZE_RESTORED or SIZE_MAXIMIZED\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user