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

user32/combo: Simplify child controls position update helper. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2019-11-26 12:59:21 +03:00 committed by Alexandre Julliard
parent b563ea018b
commit 13d7cad9de
1 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
dlls/user32/combo.c
View File

@ -1408,45 +1408,36 @@ static LRESULT COMBO_GetTextA( LPHEADCOMBO lphc, INT count, LPSTR buf )
* This function sets window positions according to the updated * This function sets window positions according to the updated
* component placement struct. * component placement struct.
*/ */
static void CBResetPos( static void CBResetPos(HEADCOMBO *combo, BOOL redraw)
LPHEADCOMBO lphc,
const RECT *rectEdit,
const RECT *rectLB,
BOOL bRedraw)
{ {
BOOL bDrop = (CB_GETTYPE(lphc) != CBS_SIMPLE); BOOL drop = CB_GETTYPE(combo) != CBS_SIMPLE;
/* NOTE: logs sometimes have WM_LBUTTONUP before a cascade of /* NOTE: logs sometimes have WM_LBUTTONUP before a cascade of
* sizing messages */ * sizing messages */
if (combo->wState & CBF_EDIT)
SetWindowPos(combo->hWndEdit, 0, combo->textRect.left, combo->textRect.top,
combo->textRect.right - combo->textRect.left,
combo->textRect.bottom - combo->textRect.top,
SWP_NOZORDER | SWP_NOACTIVATE | (drop ? SWP_NOREDRAW : 0));
if( lphc->wState & CBF_EDIT ) SetWindowPos(combo->hWndLBox, 0, combo->droppedRect.left, combo->droppedRect.top,
SetWindowPos( lphc->hWndEdit, 0, combo->droppedRect.right - combo->droppedRect.left,
rectEdit->left, rectEdit->top, combo->droppedRect.bottom - combo->droppedRect.top,
rectEdit->right - rectEdit->left, SWP_NOACTIVATE | SWP_NOZORDER | (drop ? SWP_NOREDRAW : 0));
rectEdit->bottom - rectEdit->top,
SWP_NOZORDER | SWP_NOACTIVATE | ((bDrop) ? SWP_NOREDRAW : 0) );
SetWindowPos( lphc->hWndLBox, 0, if (drop)
rectLB->left, rectLB->top,
rectLB->right - rectLB->left,
rectLB->bottom - rectLB->top,
SWP_NOACTIVATE | SWP_NOZORDER | ((bDrop) ? SWP_NOREDRAW : 0) );
if( bDrop )
{ {
if( lphc->wState & CBF_DROPPED ) if (combo->wState & CBF_DROPPED)
{ {
lphc->wState &= ~CBF_DROPPED; combo->wState &= ~CBF_DROPPED;
ShowWindow( lphc->hWndLBox, SW_HIDE ); ShowWindow(combo->hWndLBox, SW_HIDE);
} }
if( bRedraw && !(lphc->wState & CBF_NOREDRAW) ) if (redraw && !(combo->wState & CBF_NOREDRAW))
RedrawWindow( lphc->self, NULL, 0, RedrawWindow(combo->self, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW);
RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW );
} }
} }
/*********************************************************************** /***********************************************************************
* COMBO_Size * COMBO_Size
*/ */
@ -1491,7 +1482,7 @@ static void COMBO_Size( LPHEADCOMBO lphc )
CBCalcPlacement(lphc); CBCalcPlacement(lphc);
CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, FALSE ); CBResetPos(lphc, FALSE);
} }
@ -1519,7 +1510,7 @@ static void COMBO_Font( LPHEADCOMBO lphc, HFONT hFont, BOOL bRedraw )
{ {
CBCalcPlacement(lphc); CBCalcPlacement(lphc);
CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); CBResetPos(lphc, TRUE);
} }
else else
{ {
@ -1548,7 +1539,7 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height )
{ {
CBCalcPlacement(lphc); CBCalcPlacement(lphc);
CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); CBResetPos(lphc, TRUE);
} }
else else
{ {