BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

Don't allow close

Browse Source
This commit is contained in:
Scott E. Graves
2017-05-05 12:35:47 -05:00
parent f3ce676028
commit 565a513632
3 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/siadrive/siadrivehandler.h
View File

@@ -58,6 +58,7 @@ public:
private:
void PlatformTitleChange(CefRefPtr<CefBrowser> browser, const CefString& title);
private:
bool _allowClose = false;
bool _isClosing;
bool _active;
std::shared_ptr<Api::CSiaDriveConfig> _siaDriveConfig;

3
src/siadrive/siadriveapp.cpp
View File

@@ -430,6 +430,9 @@ void CSiaDriveApp::OnContextCreated(
this->SiaApiRefreshCallback(context, siaCurl, siaDriveConfig);
}));
_refreshThread->StartAutoThread();
CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("notifyAllowClose");
context->GetBrowser()->SendProcessMessage(PID_BROWSER, msg);
}
void CSiaDriveApp::OnContextInitialized()

45
src/siadrive/siadrivehandler.cpp
View File

@@ -155,6 +155,12 @@ bool CSiaDriveHandler::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser, C
{
json configDoc = json::parse(message->GetArgumentList()->GetString(0).ToString().c_str());
_siaDriveConfig.reset(new CSiaDriveConfig(configDoc));
return true;
}
else if (message->GetName() == "notifyAllowClose")
{
_allowClose = true;
return true;
}
return false;
@@ -200,30 +206,35 @@ bool CSiaDriveHandler::DoClose(CefRefPtr<CefBrowser> browser)
{
CEF_REQUIRE_UI_THREAD();
if (!_isClosing && (_browserList.size() == 1))
{
if (!_siaDriveConfig->GetCloseToTray() || g_trayClose)
{
// Set a flag to indicate that the window close should be allowed.
_isClosing = true;
CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("shutdownServices");
browser->SendProcessMessage(PID_RENDERER, msg);
}
else if (_siaDriveConfig->GetCloseToTray())
if (_allowClose)
{
if (!_isClosing && (_browserList.size() == 1))
{
if (!_siaDriveConfig->GetCloseToTray() || g_trayClose)
{
// Set a flag to indicate that the window close should be allowed.
_isClosing = true;
CefRefPtr<CefProcessMessage> msg = CefProcessMessage::Create("shutdownServices");
browser->SendProcessMessage(PID_RENDERER, msg);
}
else if (_siaDriveConfig->GetCloseToTray())
{
#ifdef _WIN32
::ShowWindow(browser->GetHost()->GetWindowHandle(), SW_HIDE);
::ShowWindow(browser->GetHost()->GetWindowHandle(), SW_HIDE);
#else
a
a
#endif
}
return true;
}
return true;
}
// Allow the close. For windowed browsers this will result in the OS close
// event being sent.
return _active;
}
// Allow the close. For windowed browsers this will result in the OS close
// event being sent.
return _active;
return true;
}
void CSiaDriveHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser)