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

Handle focus correctly.

Browse source
This commit is contained in:
Cheng Zhao 2014-06-10 11:37:07 +08:00
parent bd0f9df96c
commit 1943d88bdc
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
brightray/browser/win/inspectable_web_contents_view_win.cc
View file

@ -30,6 +30,10 @@ class ContainerView : public views::View {
web_contents_view_->inspectable_web_contents()->GetWebContents()); web_contents_view_->inspectable_web_contents()->GetWebContents());
} }
views::View* GetWebView() const {
return web_view_.get();
}
void ShowDevTools() { void ShowDevTools() {
if (IsDevToolsViewShowing()) if (IsDevToolsViewShowing())
return; return;
@ -45,6 +49,7 @@ class ContainerView : public views::View {
NULL)); NULL));
AddChildView(split_view_.get()); AddChildView(split_view_.get());
Layout(); Layout();
devtools_view_->RequestFocus();
} }
void CloseDevTools() { void CloseDevTools() {
@ -111,6 +116,10 @@ views::View* InspectableWebContentsViewWin::GetView() const {
return container_.get(); return container_.get();
} }
views::View* InspectableWebContentsViewWin::GetWebView() const {
return container_->GetWebView();
}
gfx::NativeView InspectableWebContentsViewWin::GetNativeView() const { gfx::NativeView InspectableWebContentsViewWin::GetNativeView() const {
auto web_contents = inspectable_web_contents_->GetWebContents(); auto web_contents = inspectable_web_contents_->GetWebContents();
return web_contents->GetView()->GetNativeView(); return web_contents->GetView()->GetNativeView();

1
brightray/browser/win/inspectable_web_contents_view_win.h
View file

@ -24,6 +24,7 @@ class InspectableWebContentsViewWin : public InspectableWebContentsView {
~InspectableWebContentsViewWin(); ~InspectableWebContentsViewWin();
views::View* GetView() const; views::View* GetView() const;
views::View* GetWebView() const;
virtual gfx::NativeView GetNativeView() const OVERRIDE; virtual gfx::NativeView GetNativeView() const OVERRIDE;
virtual void ShowDevTools() OVERRIDE; virtual void ShowDevTools() OVERRIDE;