New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feed Windows APIs with ICO icons of appropriate size #5624

Merged
merged 10 commits into from May 20, 2016

Conversation

Projects
None yet
3 participants
@zcbenz
Contributor

zcbenz commented May 20, 2016

This PR refactors the NativeImage code, so when a win32 API asks for icon, the raw HICON with appropriate size is passed.

Also adds BrowserWindow.setIcon API as extra benefit of the refactor.

Close #2248.
Close #3839.

@zcbenz zcbenz merged commit 8b9d189 into master May 20, 2016

5 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
electron-linux-arm Build #3273991 succeeded in 39s
Details
electron-linux-ia32 Build #3273992 succeeded in 38s
Details
electron-linux-x64 Build #3273993 succeeded in 111s
Details

@zcbenz zcbenz deleted the hicon branch May 20, 2016

@paulcbetts

This comment has been minimized.

Contributor

paulcbetts commented May 20, 2016

👏

@leshow

This comment has been minimized.

leshow commented May 26, 2016

After this commit the wrong icon is being selected, always selecting the largest in my icon set, previously the correct icon was being selected.

edit: to clarify. On windows in the windows bar, the icon being selected should be the 32px icon, however a larger on is being selected.

I am on windows 7x64 running 32bit electron 1.1.2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment