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

user32/combo: Simplify rectangles sizing 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:20 +03:00 committed by Alexandre Julliard
parent c5bceecb51
commit b563ea018b
1 changed files with 57 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
dlls/user32/combo.c
View File

@ -319,38 +319,23 @@ static void CBForceDummyResize(
* *
* Set up component coordinates given valid lphc->RectCombo. * Set up component coordinates given valid lphc->RectCombo.
*/ */
static void CBCalcPlacement( static void CBCalcPlacement(HEADCOMBO *combo)
HWND hwnd,
LPHEADCOMBO lphc,
LPRECT lprEdit,
LPRECT lprButton,
LPRECT lprLB)
{ {
/* /* Start with the client rectangle. */
* Again, start with the client rectangle. GetClientRect(combo->self, &combo->textRect);
*/
GetClientRect(hwnd, lprEdit);
/* /* Remove the borders */
* Remove the borders InflateRect(&combo->textRect, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE());
*/
InflateRect(lprEdit, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE());
/* /* Chop off the bottom part to fit with the height of the text area. */
* Chop off the bottom part to fit with the height of the text area. combo->textRect.bottom = combo->textRect.top + CBGetTextAreaHeight(combo->self, combo);
*/
lprEdit->bottom = lprEdit->top + CBGetTextAreaHeight(hwnd, lphc);
/* /* The button starts the same vertical position as the text area. */
* The button starts the same vertical position as the text area. combo->buttonRect = combo->textRect;
*/
CopyRect(lprButton, lprEdit);
/* /* If the combobox is "simple" there is no button. */
* If the combobox is "simple" there is no button. if (CB_GETTYPE(combo) == CBS_SIMPLE)
*/ combo->buttonRect.left = combo->buttonRect.right = combo->buttonRect.bottom = 0;
if( CB_GETTYPE(lphc) == CBS_SIMPLE )
lprButton->left = lprButton->right = lprButton->bottom = 0;
else else
{ {
/* /*
@ -358,72 +343,46 @@ static void CBCalcPlacement(
* scrollbar button. * scrollbar button.
* size the button horizontally and cut-off the text area. * size the button horizontally and cut-off the text area.
*/ */
lprButton->left = lprButton->right - GetSystemMetrics(SM_CXVSCROLL); combo->buttonRect.left = combo->buttonRect.right - GetSystemMetrics(SM_CXVSCROLL);
lprEdit->right = lprButton->left; combo->textRect.right = combo->buttonRect.left;
} }
/* /* In the case of a dropdown, there is an additional spacing between the text area and the button. */
* In the case of a dropdown, there is an additional spacing between the if (CB_GETTYPE(combo) == CBS_DROPDOWN)
* text area and the button. combo->textRect.right -= COMBO_EDITBUTTONSPACE();
*/
if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
{
lprEdit->right -= COMBO_EDITBUTTONSPACE();
}
/* /* If we have an edit control, we space it away from the borders slightly. */
* If we have an edit control, we space it away from the borders slightly. if (CB_GETTYPE(combo) != CBS_DROPDOWNLIST)
*/ InflateRect(&combo->textRect, -EDIT_CONTROL_PADDING(), -EDIT_CONTROL_PADDING());
if (CB_GETTYPE(lphc) != CBS_DROPDOWNLIST)
{
InflateRect(lprEdit, -EDIT_CONTROL_PADDING(), -EDIT_CONTROL_PADDING());
}
/* /* Adjust the size of the listbox popup. */
* Adjust the size of the listbox popup. if (CB_GETTYPE(combo) == CBS_SIMPLE)
*/
if( CB_GETTYPE(lphc) == CBS_SIMPLE )
{ {
/* GetClientRect(combo->self, &combo->droppedRect);
* Use the client rectangle to initialize the listbox rectangle combo->droppedRect.top = combo->textRect.bottom + COMBO_YBORDERSIZE();
*/
GetClientRect(hwnd, lprLB);
/*
* Then, chop-off the top part.
*/
lprLB->top = lprEdit->bottom + COMBO_YBORDERSIZE();
} }
else else
{ {
/* /* Make sure the dropped width is as large as the combobox itself. */
* Make sure the dropped width is as large as the combobox itself. if (combo->droppedWidth < (combo->buttonRect.right + COMBO_XBORDERSIZE()))
*/
if (lphc->droppedWidth < (lprButton->right + COMBO_XBORDERSIZE()))
{ {
lprLB->right = lprLB->left + (lprButton->right + COMBO_XBORDERSIZE()); combo->droppedRect.right = combo->droppedRect.left + (combo->buttonRect.right + COMBO_XBORDERSIZE());
/* /* In the case of a dropdown, the popup listbox is offset to the right. We want to make sure it's flush
* In the case of a dropdown, the popup listbox is offset to the right. with the right side of the combobox. */
* so, we want to make sure it's flush with the right side of the if (CB_GETTYPE(combo) == CBS_DROPDOWN)
* combobox combo->droppedRect.right -= COMBO_EDITBUTTONSPACE();
*/
if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
lprLB->right -= COMBO_EDITBUTTONSPACE();
} }
else else
lprLB->right = lprLB->left + lphc->droppedWidth; combo->droppedRect.right = combo->droppedRect.left + combo->droppedWidth;
} }
/* don't allow negative window width */ /* Disallow negative window width */
if (lprEdit->right < lprEdit->left) if (combo->textRect.right < combo->textRect.left)
lprEdit->right = lprEdit->left; combo->textRect.right = combo->textRect.left;
TRACE("\ttext\t= (%s)\n", wine_dbgstr_rect(lprEdit)); TRACE("text %s, button %s, lbox %s.\n", wine_dbgstr_rect(&combo->textRect), wine_dbgstr_rect(&combo->buttonRect),
wine_dbgstr_rect(&combo->droppedRect));
TRACE("\tbutton\t= (%s)\n", wine_dbgstr_rect(lprButton));
TRACE("\tlbox\t= (%s)\n", wine_dbgstr_rect(lprLB));
} }
/*********************************************************************** /***********************************************************************
@ -479,7 +438,7 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG
* recalculated. * recalculated.
*/ */
GetClientRect( hwnd, &lphc->droppedRect ); GetClientRect( hwnd, &lphc->droppedRect );
CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); CBCalcPlacement(lphc);
/* /*
* Adjust the position of the popup listbox if it's necessary * Adjust the position of the popup listbox if it's necessary
@ -1530,11 +1489,7 @@ static void COMBO_Size( LPHEADCOMBO lphc )
SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW); SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW);
} }
CBCalcPlacement(lphc->self, CBCalcPlacement(lphc);
lphc,
&lphc->textRect,
&lphc->buttonRect,
&lphc->droppedRect);
CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, FALSE ); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, FALSE );
} }
@ -1562,11 +1517,7 @@ static void COMBO_Font( LPHEADCOMBO lphc, HFONT hFont, BOOL bRedraw )
*/ */
if ( CB_GETTYPE(lphc) == CBS_SIMPLE) if ( CB_GETTYPE(lphc) == CBS_SIMPLE)
{ {
CBCalcPlacement(lphc->self, CBCalcPlacement(lphc);
lphc,
&lphc->textRect,
&lphc->buttonRect,
&lphc->droppedRect);
CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE );
} }
@ -1595,11 +1546,7 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height )
*/ */
if ( CB_GETTYPE(lphc) == CBS_SIMPLE) if ( CB_GETTYPE(lphc) == CBS_SIMPLE)
{ {
CBCalcPlacement(lphc->self, CBCalcPlacement(lphc);
lphc,
&lphc->textRect,
&lphc->buttonRect,
&lphc->droppedRect);
CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE );
} }
@ -2100,7 +2047,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar
lphc->droppedWidth = 0; lphc->droppedWidth = 0;
/* recalculate the combobox area */ /* recalculate the combobox area */
CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); CBCalcPlacement(lphc);
/* fall through */ /* fall through */
case CB_GETDROPPEDWIDTH: case CB_GETDROPPEDWIDTH: