github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-25 23:38:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Set window icon before showing window

Browse Source
This commit is contained in:
Cheng Zhao
2016-07-02 16:16:47 +09:00
parent 6ffcb9f06c
commit e76ec92812
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
atom/browser/api/atom_api_window.cc
View File

@@ -106,9 +106,6 @@ Window::Window(v8::Isolate* isolate, const mate::Dictionary& options) {
options,
parent.IsEmpty() ? nullptr : parent->window_.get()));
web_contents->SetOwnerWindow(window_.get());
window_->InitFromOptions(options);
window_->AddObserver(this);
AttachAsUserData(window_.get());
#if defined(TOOLKIT_VIEWS)
// Sets the window icon.
@@ -116,6 +113,10 @@ Window::Window(v8::Isolate* isolate, const mate::Dictionary& options) {
if (options.Get(options::kIcon, &icon))
SetIcon(icon);
#endif
window_->InitFromOptions(options);
window_->AddObserver(this);
AttachAsUserData(window_.get());
}
Window::~Window() {