From 30830340a83c1a6b041b60bfe5b32e1b3580d2e0 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Thu, 26 Feb 2004 13:45:44 +0000 Subject: [PATCH] - Support for RBBS_HIDETITLE style. svn path=/trunk/; revision=8399 --- reactos/lib/comctl32/rebar.c | 7 ++++--- reactos/w32api/include/commctrl.h | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/reactos/lib/comctl32/rebar.c b/reactos/lib/comctl32/rebar.c index f53da410a60..d349d5d0385 100644 --- a/reactos/lib/comctl32/rebar.c +++ b/reactos/lib/comctl32/rebar.c @@ -985,7 +985,7 @@ REBAR_CalcHorzBand (REBAR_INFO *infoPtr, UINT rstart, UINT rend, BOOL notify) } /* text is visible */ - if (lpBand->fStatus & HAS_TEXT) { + if ((lpBand->fStatus & HAS_TEXT) && !(lpBand->fStyle & RBBS_HIDETITLE)) { lpBand->fDraw |= DRAW_TEXT; lpBand->rcCapText.right = max(lpBand->rcCapText.left, lpBand->rcCapText.right-REBAR_POST_TEXT); @@ -1131,7 +1131,7 @@ REBAR_CalcVertBand (REBAR_INFO *infoPtr, UINT rstart, UINT rend, BOOL notify) } /* text is visible */ - if (lpBand->fStatus & HAS_TEXT) { + if ((lpBand->fStatus & HAS_TEXT) && !(lpBand->fStyle & RBBS_HIDETITLE)) { lpBand->fDraw |= DRAW_TEXT; lpBand->rcCapText.bottom = max(lpBand->rcCapText.top, lpBand->rcCapText.bottom); @@ -2030,7 +2030,8 @@ REBAR_ValidateBand (REBAR_INFO *infoPtr, REBAR_BAND *lpBand) } /* text is visible */ - if ((lpBand->fMask & RBBIM_TEXT) && (lpBand->lpText)) { + if ((lpBand->fMask & RBBIM_TEXT) && (lpBand->lpText) && + !(lpBand->fStyle & RBBS_HIDETITLE)) { HDC hdc = GetDC (0); HFONT hOldFont = SelectObject (hdc, infoPtr->hFont); SIZE size; diff --git a/reactos/w32api/include/commctrl.h b/reactos/w32api/include/commctrl.h index 3c15dffa5d8..6917cb26ab3 100644 --- a/reactos/w32api/include/commctrl.h +++ b/reactos/w32api/include/commctrl.h @@ -1596,6 +1596,10 @@ extern "C" { #define RBBS_HIDDEN 8 #define RBBS_NOVERT 16 #define RBBS_FIXEDBMP 32 +#if (_WIN32_IE >= 0x0501) +#define RBBS_HIDETITLE 0x400 +#define RBBS_TOPALIGN 0x800 +#endif /* _WIN32_IE >= 0x0501 */ #define RBBIM_STYLE 1 #define RBBIM_COLORS 2 #define RBBIM_TEXT 4