mirror of
https://github.com/reactos/reactos.git
synced 2024-07-16 09:26:11 +00:00
[COMCTL32] Toolbar: Use DrawThemeText when themes are enabled. CORE-12789
svn path=/trunk/; revision=74480
This commit is contained in:
parent
16989d664d
commit
a6f1faa394
|
@ -617,6 +617,9 @@ TOOLBAR_DrawString (const TOOLBAR_INFO *infoPtr, RECT *rcText, LPCWSTR lpText,
|
||||||
COLORREF clrOldBk = 0;
|
COLORREF clrOldBk = 0;
|
||||||
int oldBkMode = 0;
|
int oldBkMode = 0;
|
||||||
UINT state = tbcd->nmcd.uItemState;
|
UINT state = tbcd->nmcd.uItemState;
|
||||||
|
#ifdef __REACTOS__
|
||||||
|
HTHEME theme = GetWindowTheme (infoPtr->hwndSelf);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* draw text */
|
/* draw text */
|
||||||
if (lpText && infoPtr->nMaxTextRows > 0) {
|
if (lpText && infoPtr->nMaxTextRows > 0) {
|
||||||
|
@ -646,6 +649,25 @@ TOOLBAR_DrawString (const TOOLBAR_INFO *infoPtr, RECT *rcText, LPCWSTR lpText,
|
||||||
clrOld = SetTextColor (hdc, tbcd->clrText);
|
clrOld = SetTextColor (hdc, tbcd->clrText);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef __REACTOS__
|
||||||
|
if (theme)
|
||||||
|
{
|
||||||
|
int partId = TP_BUTTON;
|
||||||
|
int stateId = TS_NORMAL;
|
||||||
|
|
||||||
|
if (state & CDIS_DISABLED)
|
||||||
|
stateId = TS_DISABLED;
|
||||||
|
else if (state & CDIS_SELECTED)
|
||||||
|
stateId = TS_PRESSED;
|
||||||
|
else if (state & CDIS_CHECKED)
|
||||||
|
stateId = (state & CDIS_HOT) ? TS_HOTCHECKED : TS_HOT;
|
||||||
|
else if (state & CDIS_HOT)
|
||||||
|
stateId = TS_HOT;
|
||||||
|
|
||||||
|
DrawThemeText(theme, hdc, partId, stateId, lpText, -1, infoPtr->dwDTFlags, 0, rcText);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
DrawTextW (hdc, lpText, -1, rcText, infoPtr->dwDTFlags);
|
DrawTextW (hdc, lpText, -1, rcText, infoPtr->dwDTFlags);
|
||||||
SetTextColor (hdc, clrOld);
|
SetTextColor (hdc, clrOld);
|
||||||
if ((state & CDIS_MARKED) && !(dwItemCDFlag & TBCDRF_NOMARK))
|
if ((state & CDIS_MARKED) && !(dwItemCDFlag & TBCDRF_NOMARK))
|
||||||
|
|
Loading…
Reference in a new issue