mirror of
https://github.com/reactos/reactos.git
synced 2024-09-29 05:54:05 +00:00
[COMCTL32] Addendum to last commit
Sorry, something went terribly wrong with the CORE-ID
in my head 2 times, one time in the commit comment
and one time in the code!
Addendum to 0.4.15-dev-663-g
cd7db5df89
This commit is contained in:
parent
cd7db5df89
commit
7c909cbc7c
|
@ -1453,7 +1453,7 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr)
|
||||||
if( !(infoPtr->dwStyle & TBSTYLE_WRAPABLE) &&
|
if( !(infoPtr->dwStyle & TBSTYLE_WRAPABLE) &&
|
||||||
!(infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL) ) return;
|
!(infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL) ) return;
|
||||||
|
|
||||||
#ifdef __REACTOS__ /* workaround CORE-17244 part 1 of 2 */
|
#ifdef __REACTOS__ /* workaround CORE-16169 part 1 of 2 */
|
||||||
/* if width is zero then return */
|
/* if width is zero then return */
|
||||||
if (infoPtr->client_rect.right == 0) return;
|
if (infoPtr->client_rect.right == 0) return;
|
||||||
#endif
|
#endif
|
||||||
|
@ -3208,7 +3208,7 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr)
|
||||||
TRACE("auto sizing, style=%#x\n", infoPtr->dwStyle);
|
TRACE("auto sizing, style=%#x\n", infoPtr->dwStyle);
|
||||||
TRACE("nRows: %d, infoPtr->nButtonHeight: %d\n", infoPtr->nRows, infoPtr->nButtonHeight);
|
TRACE("nRows: %d, infoPtr->nButtonHeight: %d\n", infoPtr->nRows, infoPtr->nButtonHeight);
|
||||||
|
|
||||||
#ifdef __REACTOS__ /* workaround CORE-17244 part 2 of 2 */
|
#ifdef __REACTOS__ /* workaround CORE-16169 part 2 of 2 */
|
||||||
if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL))
|
if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL))
|
||||||
{
|
{
|
||||||
TOOLBAR_LayoutToolbar(infoPtr);
|
TOOLBAR_LayoutToolbar(infoPtr);
|
||||||
|
|
Loading…
Reference in a new issue