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

Improve #1307

Browse source
This commit is contained in:
Cheng Zhao 2015-03-27 16:24:33 +08:00
parent b52771e729
commit 32cd068427
5 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_window.cc
View file

@ -322,8 +322,8 @@ bool Window::IsKiosk() {
return window_->IsKiosk(); return window_->IsKiosk();
} }
void Window::OpenDevTools(bool dock) { void Window::OpenDevTools(bool can_dock) {
window_->OpenDevTools(!dock); window_->OpenDevTools(can_dock);
} }
void Window::CloseDevTools() { void Window::CloseDevTools() {

2
atom/browser/api/atom_api_window.h
View file

@ -105,7 +105,7 @@ class Window : public mate::EventEmitter,
void SetSkipTaskbar(bool skip); void SetSkipTaskbar(bool skip);
void SetKiosk(bool kiosk); void SetKiosk(bool kiosk);
bool IsKiosk(); bool IsKiosk();
void OpenDevTools(bool dock); void OpenDevTools(bool can_dock);
void CloseDevTools(); void CloseDevTools();
bool IsDevToolsOpened(); bool IsDevToolsOpened();
void InspectElement(int x, int y); void InspectElement(int x, int y);

2
atom/browser/api/lib/browser-window.coffee
View file

@ -42,7 +42,7 @@ BrowserWindow::_init = ->
BrowserWindow::openDevTools = (options={}) -> BrowserWindow::openDevTools = (options={}) ->
options.detach ?= false options.detach ?= false
@_openDevTools(options.detach) @_openDevTools !options.detach
# Force devToolsWebContents to be created. # Force devToolsWebContents to be created.
@devToolsWebContents = @getDevToolsWebContents() @devToolsWebContents = @getDevToolsWebContents()

5
atom/browser/native_window.cc
View file

@ -284,9 +284,8 @@ bool NativeWindow::HasModalDialog() {
return has_dialog_attached_; return has_dialog_attached_;
} }
void NativeWindow::OpenDevTools(bool dock) { void NativeWindow::OpenDevTools(bool can_dock) {
if (!dock) inspectable_web_contents()->SetCanDock(can_dock);
inspectable_web_contents()->SetCanDock(false);
inspectable_web_contents()->ShowDevTools(); inspectable_web_contents()->ShowDevTools();
} }

2
atom/browser/native_window.h
View file

@ -146,7 +146,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
const std::string& description) = 0; const std::string& description) = 0;
virtual bool IsClosed() const { return is_closed_; } virtual bool IsClosed() const { return is_closed_; }
virtual void OpenDevTools(bool dock); virtual void OpenDevTools(bool can_dock);
virtual void CloseDevTools(); virtual void CloseDevTools();
virtual bool IsDevToolsOpened(); virtual bool IsDevToolsOpened();
virtual void InspectElement(int x, int y); virtual void InspectElement(int x, int y);