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

comdlg32: Take linebreaks into account when resizing custom controls.

Browse Source
This commit is contained in:
David Hedberg 2011-05-27 04:05:56 +02:00 committed by Alexandre Julliard
parent 2a863985e0
commit d5a1014ed5
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/comdlg32/itemdlg.c
View File

@ -591,13 +591,15 @@ static inline customctrl *get_cctrl(FileDialogImpl *This, DWORD ctlid)
return NULL; return NULL;
} }
static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width) static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width, BOOL multiline)
{ {
LPWSTR text; LPWSTR text;
UINT len, final_width; UINT len, final_width;
UINT lines, final_height;
SIZE size; SIZE size;
RECT rc; RECT rc;
HDC hdc; HDC hdc;
WCHAR *c;
TRACE("\n"); TRACE("\n");
@ -610,9 +612,22 @@ static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width)
GetTextExtentPoint32W(hdc, text, lstrlenW(text), &size); GetTextExtentPoint32W(hdc, text, lstrlenW(text), &size);
ReleaseDC(hctrl, hdc); ReleaseDC(hctrl, hdc);
GetWindowRect(hctrl, &rc); if(len && multiline)
{
/* FIXME: line-wrap */
for(lines = 1, c = text; *c != '\0'; c++)
if(*c == '\n') lines++;
final_height = size.cy*lines + 2*4;
}
else
{
GetWindowRect(hctrl, &rc);
final_height = rc.bottom - rc.top;
}
final_width = min(max(size.cx, min_width) + 4, max_width); final_width = min(max(size.cx, min_width) + 4, max_width);
SetWindowPos(hctrl, NULL, 0, 0, final_width, rc.bottom - rc.top, SetWindowPos(hctrl, NULL, 0, 0, final_width, final_height,
SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE);
HeapFree(GetProcessHeap(), 0, text); HeapFree(GetProcessHeap(), 0, text);
@ -628,7 +643,7 @@ static void customctrl_resize(FileDialogImpl *This, customctrl *ctrl)
case IDLG_CCTRL_COMBOBOX: case IDLG_CCTRL_COMBOBOX:
case IDLG_CCTRL_CHECKBUTTON: case IDLG_CCTRL_CHECKBUTTON:
case IDLG_CCTRL_TEXT: case IDLG_CCTRL_TEXT:
ctrl_resize(ctrl->hwnd, 160, 160); ctrl_resize(ctrl->hwnd, 160, 160, TRUE);
GetWindowRect(ctrl->hwnd, &rc); GetWindowRect(ctrl->hwnd, &rc);
SetWindowPos(ctrl->wrapper_hwnd, NULL, 0, 0, rc.right-rc.left, rc.bottom-rc.top, SetWindowPos(ctrl->wrapper_hwnd, NULL, 0, 0, rc.right-rc.left, rc.bottom-rc.top,
SWP_NOZORDER|SWP_NOMOVE|SWP_NOZORDER); SWP_NOZORDER|SWP_NOMOVE|SWP_NOZORDER);
@ -1349,21 +1364,21 @@ static void update_control_text(FileDialogImpl *This)
(hitem = GetDlgItem(This->dlg_hwnd, IDOK))) (hitem = GetDlgItem(This->dlg_hwnd, IDOK)))
{ {
SetWindowTextW(hitem, This->custom_okbutton); SetWindowTextW(hitem, This->custom_okbutton);
ctrl_resize(hitem, 50, 250); ctrl_resize(hitem, 50, 250, FALSE);
} }
if(This->custom_cancelbutton && if(This->custom_cancelbutton &&
(hitem = GetDlgItem(This->dlg_hwnd, IDCANCEL))) (hitem = GetDlgItem(This->dlg_hwnd, IDCANCEL)))
{ {
SetWindowTextW(hitem, This->custom_cancelbutton); SetWindowTextW(hitem, This->custom_cancelbutton);
ctrl_resize(hitem, 50, 250); ctrl_resize(hitem, 50, 250, FALSE);
} }
if(This->custom_filenamelabel && if(This->custom_filenamelabel &&
(hitem = GetDlgItem(This->dlg_hwnd, IDC_FILENAMESTATIC))) (hitem = GetDlgItem(This->dlg_hwnd, IDC_FILENAMESTATIC)))
{ {
SetWindowTextW(hitem, This->custom_filenamelabel); SetWindowTextW(hitem, This->custom_filenamelabel);
ctrl_resize(hitem, 50, 250); ctrl_resize(hitem, 50, 250, FALSE);
} }
} }