Add support for using .ico icon files on Windows
NativeImage::CreateFromPath now supports loading .ico icon files on Windows.
This commit is contained in:
parent
3250764e72
commit
bec7a399cb
1 changed files with 20 additions and 1 deletions
|
@ -22,6 +22,9 @@
|
||||||
#include "ui/gfx/geometry/size.h"
|
#include "ui/gfx/geometry/size.h"
|
||||||
#include "ui/gfx/image/image_skia.h"
|
#include "ui/gfx/image/image_skia.h"
|
||||||
#include "ui/gfx/image/image_util.h"
|
#include "ui/gfx/image/image_util.h"
|
||||||
|
#if defined(OS_WIN)
|
||||||
|
#include "ui/gfx/icon_util.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "atom/common/node_includes.h"
|
#include "atom/common/node_includes.h"
|
||||||
|
|
||||||
|
@ -213,7 +216,23 @@ mate::Handle<NativeImage> NativeImage::CreateFromJPEG(
|
||||||
mate::Handle<NativeImage> NativeImage::CreateFromPath(
|
mate::Handle<NativeImage> NativeImage::CreateFromPath(
|
||||||
v8::Isolate* isolate, const base::FilePath& path) {
|
v8::Isolate* isolate, const base::FilePath& path) {
|
||||||
gfx::ImageSkia image_skia;
|
gfx::ImageSkia image_skia;
|
||||||
PopulateImageSkiaRepsFromPath(&image_skia, path);
|
if (path.MatchesExtension(FILE_PATH_LITERAL(".ico"))) {
|
||||||
|
#if defined(OS_WIN)
|
||||||
|
HICON icon = static_cast<HICON>(LoadImage(NULL,
|
||||||
|
path.value().c_str(),
|
||||||
|
IMAGE_ICON,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
LR_DEFAULTSIZE | LR_LOADFROMFILE));
|
||||||
|
if (icon) {
|
||||||
|
scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(icon));
|
||||||
|
image_skia = *(new gfx::ImageSkia(gfx::ImageSkiaRep(*bitmap, 1.0f)));
|
||||||
|
DestroyIcon(icon);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
} else {
|
||||||
|
PopulateImageSkiaRepsFromPath(&image_skia, path);
|
||||||
|
}
|
||||||
gfx::Image image(image_skia);
|
gfx::Image image(image_skia);
|
||||||
mate::Handle<NativeImage> handle = Create(isolate, image);
|
mate::Handle<NativeImage> handle = Create(isolate, image);
|
||||||
#if defined(OS_MACOSX)
|
#if defined(OS_MACOSX)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue