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

Correctly set window icon from ICO

Browse source
This commit is contained in:
Cheng Zhao 2016-05-20 19:46:05 +09:00
parent ea2807c890
commit d26480b74e
6 changed files with 34 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/native_window_views.cc
View file

@ -221,6 +221,10 @@ NativeWindowViews::NativeWindowViews(
std::string window_type;
if (options.Get(options::kType, &window_type))
SetWindowType(GetAcceleratedWidget(), window_type);
// Set window icon.
options.Get(options::kIcon, &icon_);
window_->UpdateWindowIcon();
#endif
// Add web view.
@ -273,7 +277,6 @@ NativeWindowViews::NativeWindowViews(
use_content_size_)
size = ContentSizeToWindowSize(size);
window_->UpdateWindowIcon();
window_->CenterWindow(size);
Layout();
}
@ -842,13 +845,15 @@ bool NativeWindowViews::ShouldHandleSystemCommands() const {
return true;
}
#if defined(USE_X11)
gfx::ImageSkia NativeWindowViews::GetWindowAppIcon() {
return icon();
return icon_;
}
gfx::ImageSkia NativeWindowViews::GetWindowIcon() {
return GetWindowAppIcon();
}
#endif
views::Widget* NativeWindowViews::GetWidget() {
return window_.get();