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

comctl32/taskdialog: Display content text label. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-05-24 20:43:25 +03:00 committed by Alexandre Julliard
parent 980754bff7
commit 8967e87c8a
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlls/comctl32/taskdialog.c
View File

@ -47,6 +47,7 @@ static const UINT DIALOG_BUTTON_WIDTH = 50;
static const UINT DIALOG_BUTTON_HEIGHT = 14; static const UINT DIALOG_BUTTON_HEIGHT = 14;
static const UINT ID_MAIN_INSTRUCTION = 0xf000; static const UINT ID_MAIN_INSTRUCTION = 0xf000;
static const UINT ID_CONTENT = 0xf001;
struct taskdialog_control struct taskdialog_control
{ {
@ -134,7 +135,7 @@ static unsigned int taskdialog_add_control(struct taskdialog_template_desc *desc
return ALIGNED_LENGTH(size, 3); return ALIGNED_LENGTH(size, 3);
} }
static unsigned int taskdialog_add_main_instruction(struct taskdialog_template_desc *desc) static unsigned int taskdialog_add_static_label(struct taskdialog_template_desc *desc, WORD id, const WCHAR *str)
{ {
RECT rect = { 0, 0, desc->dialog_width - DIALOG_SPACING * 2, 0}; /* padding left and right of the control */ RECT rect = { 0, 0, desc->dialog_width - DIALOG_SPACING * 2, 0}; /* padding left and right of the control */
const WCHAR *textW = NULL; const WCHAR *textW = NULL;
@ -142,21 +143,20 @@ static unsigned int taskdialog_add_main_instruction(struct taskdialog_template_d
HFONT oldfont; HFONT oldfont;
HDC hdc; HDC hdc;
if (!desc->taskconfig->pszMainInstruction) if (!str)
return 0; return 0;
if (IS_INTRESOURCE(desc->taskconfig->pszMainInstruction)) if (IS_INTRESOURCE(str))
{ {
if (!(length = LoadStringW(desc->taskconfig->hInstance, (UINT_PTR)desc->taskconfig->pszMainInstruction, if (!(length = LoadStringW(desc->taskconfig->hInstance, (UINT_PTR)str, (WCHAR *)&textW, 0)))
(WCHAR *)&textW, 0)))
{ {
WARN("Failed to load main instruction text\n"); WARN("Failed to load static text %s, id %#x\n", debugstr_w(str), id);
return 0; return 0;
} }
} }
else else
{ {
textW = desc->taskconfig->pszMainInstruction; textW = str;
length = strlenW(textW); length = strlenW(textW);
} }
@ -170,13 +170,23 @@ static unsigned int taskdialog_add_main_instruction(struct taskdialog_template_d
SelectObject(hdc, oldfont); SelectObject(hdc, oldfont);
ReleaseDC(0, hdc); ReleaseDC(0, hdc);
size = taskdialog_add_control(desc, ID_MAIN_INSTRUCTION, WC_STATICW, desc->taskconfig->hInstance, desc->dialog_height += DIALOG_SPACING;
desc->taskconfig->pszMainInstruction, DIALOG_SPACING, desc->dialog_height, size = taskdialog_add_control(desc, id, WC_STATICW, desc->taskconfig->hInstance, str, DIALOG_SPACING,
rect.right, rect.bottom); desc->dialog_height, rect.right, rect.bottom);
desc->dialog_height += rect.bottom; desc->dialog_height += rect.bottom;
return size; return size;
} }
static unsigned int taskdialog_add_main_instruction(struct taskdialog_template_desc *desc)
{
return taskdialog_add_static_label(desc, ID_MAIN_INSTRUCTION, desc->taskconfig->pszMainInstruction);
}
static unsigned int taskdialog_add_content(struct taskdialog_template_desc *desc)
{
return taskdialog_add_static_label(desc, ID_CONTENT, desc->taskconfig->pszContent);
}
static unsigned int taskdialog_add_common_buttons(struct taskdialog_template_desc *desc) static unsigned int taskdialog_add_common_buttons(struct taskdialog_template_desc *desc)
{ {
short button_x = desc->dialog_width - DIALOG_BUTTON_WIDTH - DIALOG_SPACING; short button_x = desc->dialog_width - DIALOG_BUTTON_WIDTH - DIALOG_SPACING;
@ -289,11 +299,12 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi
screen_width = taskdialog_get_reference_rect(&desc, &ref_rect); screen_width = taskdialog_get_reference_rect(&desc, &ref_rect);
desc.dialog_height = DIALOG_SPACING; desc.dialog_height = 0;
desc.dialog_width = max(taskconfig->cxWidth, DIALOG_MIN_WIDTH); desc.dialog_width = max(taskconfig->cxWidth, DIALOG_MIN_WIDTH);
desc.dialog_width = min(desc.dialog_width, screen_width); desc.dialog_width = min(desc.dialog_width, screen_width);
size += taskdialog_add_main_instruction(&desc); size += taskdialog_add_main_instruction(&desc);
size += taskdialog_add_content(&desc);
size += taskdialog_add_common_buttons(&desc); size += taskdialog_add_common_buttons(&desc);
template = Alloc(size); template = Alloc(size);