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

views: Set devtools window's icon, fixes #429.

Browse source
This commit is contained in:
Cheng Zhao 2014-09-09 15:30:33 +08:00
parent 700510d63a
commit bda317b000
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/native_window_views.cc
View file

@ -613,6 +613,10 @@ views::NonClientFrameView* NativeWindowViews::CreateNonClientFrameView(
return NULL; return NULL;
} }
gfx::ImageSkia NativeWindowViews::GetDevToolsWindowIcon() {
return GetWindowAppIcon();
}
void NativeWindowViews::HandleMouseDown() { void NativeWindowViews::HandleMouseDown() {
// Hide menu bar when web view is clicked. // Hide menu bar when web view is clicked.
if (menu_bar_autohide_ && menu_bar_visible_) { if (menu_bar_autohide_ && menu_bar_visible_) {

3
atom/browser/native_window_views.h
View file

@ -105,6 +105,9 @@ class NativeWindowViews : public NativeWindow,
virtual views::NonClientFrameView* CreateNonClientFrameView( virtual views::NonClientFrameView* CreateNonClientFrameView(
views::Widget* widget) OVERRIDE; views::Widget* widget) OVERRIDE;
// brightray::InspectableWebContentsDelegate:
virtual gfx::ImageSkia GetDevToolsWindowIcon() OVERRIDE;
// content::WebContentsDelegate: // content::WebContentsDelegate:
virtual void HandleMouseDown() OVERRIDE; virtual void HandleMouseDown() OVERRIDE;
virtual void HandleKeyboardEvent( virtual void HandleKeyboardEvent(

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit dafc85799ca31e3ddd7b5d0cc0ef7fbf38dcf88f Subproject commit a108f0b10be6c0058b03ba8e89addf6ea8289b7e