mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Take control if devtools is undocked.

Browse source
This commit is contained in:
Cheng Zhao 2014-03-04 15:46:12 +08:00
parent d37bf06b5a
commit c2996d4fd1
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
browser/native_window.cc
View file

@ -180,12 +180,15 @@ bool NativeWindow::HasModalDialog() {
} }
void NativeWindow::OpenDevTools() { void NativeWindow::OpenDevTools() {
// Check if the devtools is docked. // Check if the devtools is undocked.
AtomBrowserContext* browser_context = AtomBrowserContext::Get(); AtomBrowserContext* browser_context = AtomBrowserContext::Get();
std::string dock_side = browser_context->prefs()->GetString(kDockSidePref); std::string dock_side = browser_context->prefs()->GetString(kDockSidePref);
if (dock_side == "undocked") if (dock_side == "undocked") {
browser_context->prefs()->SetString(kDockSidePref, "bottom"); Debug(GetWebContents());
return;
}
// For docked devtools we give it to brightray.
inspectable_web_contents()->ShowDevTools(); inspectable_web_contents()->ShowDevTools();
// Intercept the requestSetDockSide message of devtools. // Intercept the requestSetDockSide message of devtools.
@ -494,14 +497,14 @@ bool NativeWindow::OnRequestSetDockSide(const base::ListValue& args) {
static_cast<brightray::DevToolsEmbedderMessageDispatcher::Delegate*>( static_cast<brightray::DevToolsEmbedderMessageDispatcher::Delegate*>(
inspectable_web_contents()); inspectable_web_contents());
// Do not allow the "undocked" state. // Takeover when devtools is undocked.
std::string dock_side; std::string dock_side;
if (args.GetString(0, &dock_side) && dock_side == "undocked") { if (args.GetString(0, &dock_side) && dock_side == "undocked") {
delegate->CloseWindow(); delegate->CloseWindow();
return true; Debug(GetWebContents());
} else {
delegate->SetDockSide(dock_side);
} }
delegate->SetDockSide(dock_side);
return true; return true;
} }