bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Clean up implementation of modal window callbacks (issue #281).

Browse Source 
- Fix CefBrowser::GoForward documentation typo (issue #291).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@271 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-08-03 15:35:51 +00:00
parent 0f414c8ac8
commit 512b864639
20 changed files with 187 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libcef/browser_impl_win.cc
View File

@@ -40,31 +40,23 @@ LRESULT CALLBACK CefBrowserImpl::WndProc(HWND hwnd, UINT message,
switch (message) {
case WM_CLOSE:
// It is the responsibility of the client to send this message to this
// window if it is created as a child window of a client's frame window.
// This is particularly important when this window is modal.
if(browser) {
// Here the window really is about to get closed.
bool handled(false);
if (browser->client_.get()) {
CefRefPtr<CefLifeSpanHandler> handler =
CefRefPtr<CefLifeSpanHandler> handler =
browser->client_->GetLifeSpanHandler();
if (handler.get()) {
// Notify the handler that the window is about to be closed.
handler->OnBeforeClose(browser);
// Give the client a chance to handle this one.
handled = handler->DoClose(browser);
}
}
// We must re-enable the opener (owner of the modal window)
// before we close the popup to avoid focus/activation/z-order issues.
if (browser->opener_ && browser->opener_was_disabled_by_modal_loop_) {
HWND owner = ::GetAncestor(browser->opener_, GA_ROOT);
::EnableWindow(owner, TRUE);
}
// Don't do the default if this is a contained window as the destruction
// will occur when the parent frame window is destroyed.
if (::GetAncestor(hwnd, GA_ROOT) != hwnd)
if (handled)
return 0;
// We are our own parent in this case.
browser->ParentWindowWillClose();
}
break;
@@ -82,7 +74,7 @@ LRESULT CALLBACK CefBrowserImpl::WndProc(HWND hwnd, UINT message,
if (browser && browser->UIT_GetWebView()) {
// resize the web view window to the full size of the browser window
RECT rc;
GetClientRect(browser->UIT_GetMainWndHandle(), &rc);
GetClientRect(hwnd, &rc);
MoveWindow(browser->UIT_GetWebViewWndHandle(), 0, 0, rc.right, rc.bottom,
TRUE);
}
@@ -100,6 +92,16 @@ LRESULT CALLBACK CefBrowserImpl::WndProc(HWND hwnd, UINT message,
return DefWindowProc(hwnd, message, wParam, lParam);
}
void CefBrowserImpl::ParentWindowWillClose()
{
// We must re-enable the opener (owner of the modal window) before we close
// the popup to avoid focus/activation/z-order issues.
if (opener_ && opener_was_disabled_by_modal_loop_) {
HWND owner = ::GetAncestor(opener_, GA_ROOT);
::EnableWindow(owner, TRUE);
}
}
CefWindowHandle CefBrowserImpl::GetWindowHandle()
{
AutoLock lock_scope(this);