Skip to content

W
wine-winehq
Commit 8809bef4 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

mshtml: Call set_ns_editmode in better place.

parent 77ff2df8
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
dlls/mshtml/olecmd.c
View file @ 8809bef4
...@@ -583,9 +583,6 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, ...@@ -583,9 +583,6 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS));
} }
if(This->nscontainer)
set_ns_editmode(This->nscontainer);
update_doc(This, UPDATE_UI); update_doc(This, UPDATE_UI);
if(This->mon) { if(This->mon) {
...@@ -610,12 +607,17 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, ...@@ -610,12 +607,17 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
return hres; return hres;
if(This->ui_active) { if(This->ui_active) {
RECT rcBorderWidths;
if(This->ip_window) if(This->ip_window)
call_set_active_object(This->ip_window, NULL); call_set_active_object(This->ip_window, NULL);
if(This->hostui) if(This->hostui)
IDocHostUIHandler_HideUI(This->hostui); IDocHostUIHandler_HideUI(This->hostui);
}
if(This->nscontainer)
set_ns_editmode(This->nscontainer);
if(This->ui_active) {
RECT rcBorderWidths;
if(This->hostui) if(This->hostui)
IDocHostUIHandler_ShowUI(This->hostui, DOCHOSTUITYPE_AUTHOR, ACTOBJ(This), CMDTARGET(This), IDocHostUIHandler_ShowUI(This->hostui, DOCHOSTUITYPE_AUTHOR, ACTOBJ(This), CMDTARGET(This),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment