system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 16:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

- set the item height not only for the listbox, but also for the text field

Browse source 
- center text vertically
- beautify comments
This commit is contained in:
Andreas Mohr 2000-10-28 00:29:58 +00:00 committed by Alexandre Julliard
parent a420e6f9a2
commit 45c9fd892f
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
controls/combo.c
View file

@ -160,7 +160,7 @@ static LRESULT COMBO_NCDestroy( LPHEADCOMBO lphc )
* This method will calculate the height of the text area of the
* combobox.
* The height of the text area is set in two ways.
* It can be set explicitely through a combobox message of through a
* It can be set explicitely through a combobox message or through a
* WM_MEASUREITEM callback.
* If this is not the case, the height is set to 13 dialog units.
* This height was determined through experimentation.
@ -613,10 +613,10 @@ static LRESULT COMBO_Create( LPHEADCOMBO lphc, WND* wnd, LPARAM lParam)
/* Now do the trick with parent */
SetParent(lphc->hWndLBox, HWND_DESKTOP);
/*
* If the combo is a dropdown, we must resize the control to fit only
* the text area and button. To do this, we send a dummy resize and the
* WM_WINDOWPOSCHANGING message will take care of setting the height for
* us.
* If the combo is a dropdown, we must resize the control
* to fit only the text area and button. To do this,
* we send a dummy resize and the WM_WINDOWPOSCHANGING message
* will take care of setting the height for us.
*/
CBForceDummyResize(lphc);
}

17
dlls/commdlg/filedlg95.c
View file

@ -3,7 +3,7 @@
*
* FIXME: lpstrCustomFilter not handled
*
* FIXME: if the size of lpstrFile (nMaxFile) is to small the first
* FIXME: if the size of lpstrFile (nMaxFile) is too small the first
* two bytes of lpstrFile should contain the needed size
*
* FIXME: algorithm for selecting the initial directory is too simple
@ -69,7 +69,6 @@ typedef struct tagLookInInfo
/* Draw item constant */
#define ICONWIDTH 18
#define YTEXTOFFSET 2
#define XTEXTOFFSET 3
/* AddItem flags*/
@ -85,7 +84,7 @@ typedef struct tagLookInInfo
/* NOTE
* Those macros exist in windowsx.h. However, you can't really use them since
* they rely on the UNICODE defines and can't be use inside Wine itself.
* they rely on the UNICODE defines and can't be used inside Wine itself.
*/
/* Combo box macros */
@ -1764,6 +1763,9 @@ static HRESULT FILEDLG95_LOOKIN_Init(HWND hwndCombo)
liInfos->iMaxIndentation = 0;
SetPropA(hwndCombo, LookInInfosStr, (HANDLE) liInfos);
/* set item height for both text field and listbox */
CBSetItemHeight(hwndCombo,-1,GetSystemMetrics(SM_CYSMICON));
CBSetItemHeight(hwndCombo,0,GetSystemMetrics(SM_CYSMICON));
/* Initialise data of Desktop folder */
@ -1830,6 +1832,7 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct)
SHFILEINFOA sfi;
HIMAGELIST ilItemImage;
int iIndentation;
TEXTMETRICA tm;
LPSFOLDER tmpFolder;
@ -1905,11 +1908,13 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct)
rectIcon.bottom = pDIStruct->rcItem.bottom;
/* Initialise the text display area */
GetTextMetricsA(pDIStruct->hDC, &tm);
rectText.left = rectIcon.right;
rectText.top = pDIStruct->rcItem.top + YTEXTOFFSET;
rectText.top =
(pDIStruct->rcItem.top + pDIStruct->rcItem.bottom - tm.tmHeight) / 2;
rectText.right = pDIStruct->rcItem.right + XTEXTOFFSET;
rectText.bottom = pDIStruct->rcItem.bottom;
rectText.bottom =
(pDIStruct->rcItem.top + pDIStruct->rcItem.bottom + tm.tmHeight) / 2;
/* Draw the icon from the image list */
COMDLG32_ImageList_Draw(ilItemImage,