mac: cefclient: Fix window.close() with --hide-window-on-close (fixes #3660)
This commit is contained in:
parent
6514b929c4
commit
59f3b143ef
|
@ -817,9 +817,11 @@ void ViewsWindow::OnWindowBoundsChanged(CefRefPtr<CefWindow> window,
|
||||||
bool ViewsWindow::CanClose(CefRefPtr<CefWindow> window) {
|
bool ViewsWindow::CanClose(CefRefPtr<CefWindow> window) {
|
||||||
CEF_REQUIRE_UI_THREAD();
|
CEF_REQUIRE_UI_THREAD();
|
||||||
|
|
||||||
|
CefRefPtr<CefBrowser> browser = browser_view_->GetBrowser();
|
||||||
|
|
||||||
#if defined(OS_MAC)
|
#if defined(OS_MAC)
|
||||||
// On MacOS we might hide the window instead of closing it.
|
// On MacOS we might hide the window instead of closing it.
|
||||||
if (hide_on_close_) {
|
if (hide_on_close_ && browser && !browser->GetHost()->IsReadyToBeClosed()) {
|
||||||
if (window->IsFullscreen()) {
|
if (window->IsFullscreen()) {
|
||||||
// Need to exit fullscreen mode before hiding the window.
|
// Need to exit fullscreen mode before hiding the window.
|
||||||
// Execution continues in OnWindowFullscreenTransition.
|
// Execution continues in OnWindowFullscreenTransition.
|
||||||
|
@ -833,7 +835,6 @@ bool ViewsWindow::CanClose(CefRefPtr<CefWindow> window) {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Allow the window to close if the browser says it's OK.
|
// Allow the window to close if the browser says it's OK.
|
||||||
CefRefPtr<CefBrowser> browser = browser_view_->GetBrowser();
|
|
||||||
if (browser) {
|
if (browser) {
|
||||||
return browser->GetHost()->TryCloseBrowser();
|
return browser->GetHost()->TryCloseBrowser();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue