Call ShowUI and HideUI in UIActivate.
This commit is contained in:
parent
7581d47f92
commit
9caed94dd1
|
@ -264,6 +264,8 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f
|
||||||
return hres;
|
return hres;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TRACE("got parent window %p\n", parent_hwnd);
|
||||||
|
|
||||||
hwnd = CreateWindowExW(0, wszInternetExplorer_Server, NULL,
|
hwnd = CreateWindowExW(0, wszInternetExplorer_Server, NULL,
|
||||||
WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
|
WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
|
||||||
posrect.left, posrect.top, posrect.right-posrect.left, posrect.bottom-posrect.top,
|
posrect.left, posrect.top, posrect.right-posrect.left, posrect.bottom-posrect.top,
|
||||||
|
@ -298,11 +300,16 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f
|
||||||
IOleInPlaceFrame_Release(This->frame);
|
IOleInPlaceFrame_Release(This->frame);
|
||||||
This->frame = pIPFrame;
|
This->frame = pIPFrame;
|
||||||
This->hwnd = hwnd;
|
This->hwnd = hwnd;
|
||||||
}else {
|
|
||||||
static const WCHAR wszEmpty[] = {0};
|
|
||||||
|
|
||||||
|
hres = IDocHostUIHandler_ShowUI(This->hostui, 0, ACTOBJ(This), CMDTARGET(This),
|
||||||
|
pIPFrame, NULL);
|
||||||
|
if(FAILED(hres))
|
||||||
|
IDocHostUIHandler_HideUI(This->hostui);
|
||||||
|
}else {
|
||||||
if(This->frame)
|
if(This->frame)
|
||||||
IOleInPlaceFrame_SetActiveObject(This->frame, NULL, wszEmpty);
|
IOleInPlaceFrame_SetActiveObject(This->frame, NULL, NULL);
|
||||||
|
if(This->hostui)
|
||||||
|
IDocHostUIHandler_HideUI(This->hostui);
|
||||||
if(This->ipsite)
|
if(This->ipsite)
|
||||||
IOleInPlaceSite_OnUIDeactivate(This->ipsite, FALSE);
|
IOleInPlaceSite_OnUIDeactivate(This->ipsite, FALSE);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue