-
Notifications
You must be signed in to change notification settings - Fork 68
Make 16x16 .ico files possible for toolbar #366
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
6713314
Convert loaded .ico files to bitmap handles; fixes #195
Ekopalypse 6faf9ca
Make 16x16 .ico files possible for toolbar
Ekopalypse 90373a1
Add utility files to PythonScript.vcxproj
Ekopalypse 74c5c2a
Add utility.cpp to PythonScript.Tests.vcxproj
Ekopalypse File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| #include "stdafx.h" | ||
| #include "Utility.h" | ||
|
|
||
| HBITMAP ConvertIconToBitmap(LPCWSTR file_path) { | ||
| HBITMAP hBitmap = nullptr; | ||
| HICON hIcon = (HICON)LoadImage(nullptr, file_path, IMAGE_ICON, 16, 16, LR_COLOR | LR_LOADFROMFILE); | ||
| if (hIcon) { | ||
| ICONINFO iconInfo; | ||
| if (GetIconInfo(hIcon, &iconInfo)) { | ||
| HDC hdc = GetDC(nullptr); | ||
| if (hdc) { | ||
| HDC hdcMem = CreateCompatibleDC(hdc); | ||
| if (hdcMem) { | ||
| BITMAP bm{}; | ||
| if (GetObject(iconInfo.hbmColor, sizeof(BITMAP), &bm)) { | ||
| hBitmap = CreateCompatibleBitmap(hdc, 16, 16); | ||
| if (hBitmap) { | ||
| HBITMAP hbmOld = (HBITMAP)SelectObject(hdcMem, hBitmap); | ||
| DrawIconEx(hdcMem, 0, 0, hIcon, 16, 16, 0, nullptr, DI_NORMAL); | ||
| SelectObject(hdcMem, hbmOld); | ||
| } | ||
| } | ||
| DeleteDC(hdcMem); | ||
| } | ||
| ReleaseDC(nullptr, hdc); | ||
| } | ||
| DeleteObject(iconInfo.hbmColor); | ||
| DeleteObject(iconInfo.hbmMask); | ||
| } | ||
| DestroyIcon(hIcon); | ||
| } | ||
| return hBitmap; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| #ifndef _PYTHONSCRIPT_UTILITY_H | ||
| #define _PYTHONSCRIPT_UTILITY_H | ||
| #endif | ||
|
|
||
| #include <wtypes.h> | ||
|
|
||
| HBITMAP ConvertIconToBitmap(LPCWSTR file_path); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe DPIManagerV2::loadIcon() could be used here for High DPI support.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The size is currently set to 16x16. To support really high dpi, further changes are probably needed, e.g. how to handle multiple bmp sizes.