reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-01-27 06:53:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mshtml: Use QueryCommandState to get align state.

Browse Source
This commit is contained in:
Jacek Caban 2010-08-18 13:36:55 +02:00 committed by Alexandre Julliard
parent 3fbf6bdf11
commit 3d3f223a71
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlls/mshtml/editor.c
View File

@ -180,25 +180,33 @@ static void set_ns_align(HTMLDocument *This, const char *align_str)
nsICommandParams_Release(nsparam); nsICommandParams_Release(nsparam);
} }
static DWORD query_align_status(HTMLDocument *This, const char *align_str) static DWORD query_align_status(HTMLDocument *This, const WCHAR *align)
{ {
nsICommandParams *nsparam; DWORD ret = OLECMDF_SUPPORTED | OLECMDF_ENABLED;
char *align = NULL; nsIDOMNSHTMLDocument *nsdoc;
nsAString justify_str;
PRBool b;
nsresult nsres;
if(This->doc_obj->usermode != EDITMODE || This->window->readystate < READYSTATE_INTERACTIVE) if(This->doc_obj->usermode != EDITMODE || This->window->readystate < READYSTATE_INTERACTIVE)
return OLECMDF_SUPPORTED; return OLECMDF_SUPPORTED;
if(This->doc_obj->nscontainer) {
nsparam = create_nscommand_params();
get_ns_command_state(This->doc_obj->nscontainer, NSCMD_ALIGN, nsparam);
nsICommandParams_GetCStringValue(nsparam, NSSTATE_ATTRIBUTE, &align); nsres = nsIDOMHTMLDocument_QueryInterface(This->doc_node->nsdoc, &IID_nsIDOMNSHTMLDocument,
(void**)&nsdoc);
nsICommandParams_Release(nsparam); if(NS_FAILED(nsres)) {
ERR("Could not get nsIDOMNSHTMLDocument iface: %08x\n", nsres);
return 0;
} }
return OLECMDF_SUPPORTED | OLECMDF_ENABLED nsAString_Init(&justify_str, align);
| (align && !strcmp(align_str, align) ? OLECMDF_LATCHED : 0); nsres = nsIDOMNSHTMLDocument_QueryCommandState(nsdoc, &justify_str, &b);
nsAString_Finish(&justify_str);
if(NS_SUCCEEDED(nsres) && b)
ret |= OLECMDF_LATCHED;
nsIDOMNSHTMLDocument_Release(nsdoc);
return ret;
} }
@ -704,10 +712,13 @@ static HRESULT exec_italic(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VA
static HRESULT query_justify(HTMLDocument *This, OLECMD *cmd) static HRESULT query_justify(HTMLDocument *This, OLECMD *cmd)
{ {
static const PRUnichar justifycenterW[] = {'j','u','s','t','i','f','y','c','e','n','t','e','r',0};
static const PRUnichar justifyrightW[] = {'j','u','s','t','i','f','y','r','i','g','h','t',0};
switch(cmd->cmdID) { switch(cmd->cmdID) {
case IDM_JUSTIFYCENTER: case IDM_JUSTIFYCENTER:
TRACE("(%p) IDM_JUSTIFYCENTER\n", This); TRACE("(%p) IDM_JUSTIFYCENTER\n", This);
cmd->cmdf = query_align_status(This, NSALIGN_CENTER); cmd->cmdf = query_align_status(This, justifycenterW);
break; break;
case IDM_JUSTIFYLEFT: case IDM_JUSTIFYLEFT:
TRACE("(%p) IDM_JUSTIFYLEFT\n", This); TRACE("(%p) IDM_JUSTIFYLEFT\n", This);
@ -719,7 +730,7 @@ static HRESULT query_justify(HTMLDocument *This, OLECMD *cmd)
break; break;
case IDM_JUSTIFYRIGHT: case IDM_JUSTIFYRIGHT:
TRACE("(%p) IDM_JUSTIFYRIGHT\n", This); TRACE("(%p) IDM_JUSTIFYRIGHT\n", This);
cmd->cmdf = query_align_status(This, NSALIGN_RIGHT); cmd->cmdf = query_align_status(This, justifyrightW);
break; break;
} }