system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-19 08:03:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

comdlg32/fontdlg: Allow setting value by typing it into the edit fields.

Browse source 
The font-dialog allows the user to select a value from the combobox by
typing it into its edit field. This operation seems unique to the
fontdialog. It works case-insensitively and doesn't change the
selection in the edit field.

Signed-off-by: Fabian Maurer <dark.shadow4@web.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Fabian Maurer 2017-11-11 16:15:17 +01:00 committed by Alexandre Julliard
parent 500f077dd6
commit aa7941d41b
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
dlls/comdlg32/fontdlg.c
View file

@ -940,14 +940,37 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO
int i;
long l;
HDC hdc;
BOOL cmb_selected_by_edit = FALSE;
if (!lpcf) return FALSE;
if(HIWORD(wParam) == CBN_EDITCHANGE)
{
int idx;
WCHAR str_edit[256], str_cmb[256];
int cmb = LOWORD(wParam);
GetDlgItemTextW(hDlg, cmb, str_edit, sizeof(str_edit) / sizeof(str_edit[0]));
idx = SendDlgItemMessageW(hDlg, cmb, CB_FINDSTRING, -1, (LPARAM)str_edit);
if(idx != -1)
{
SendDlgItemMessageW(hDlg, cmb, CB_GETLBTEXT, idx, (LPARAM)str_cmb);
/* Select listbox entry only if we have an exact match */
if(lstrcmpiW(str_edit, str_cmb) == 0)
{
SendDlgItemMessageW(hDlg, cmb, CB_SETCURSEL, idx, 0);
SendDlgItemMessageW(hDlg, cmb, CB_SETEDITSEL, 0, -1); /* Remove edit field selection */
cmb_selected_by_edit = TRUE;
}
}
}
TRACE("WM_COMMAND wParam=%08X lParam=%08lX\n", (LONG)wParam, lParam);
switch (LOWORD(wParam))
{
case cmb1:
if (HIWORD(wParam)==CBN_SELCHANGE)
if (HIWORD(wParam) == CBN_SELCHANGE || cmb_selected_by_edit)
{
INT pointsize; /* save current pointsize */
LONG pstyle; /* save current style */
@ -998,7 +1021,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO
case cmb2:
case cmb3:
case cmb5:
if (HIWORD(wParam)==CBN_SELCHANGE || HIWORD(wParam)== BN_CLICKED )
if (HIWORD(wParam) == CBN_SELCHANGE || HIWORD(wParam) == BN_CLICKED || cmb_selected_by_edit)
{
WCHAR str[256];
WINDOWINFO wininfo;