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

Load HICON directly in NotifyIcon

Browse source
This commit is contained in:
Cheng Zhao 2016-05-20 16:55:22 +09:00
parent 67d9ae27c3
commit 9e26e5c121
7 changed files with 62 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

20
atom/common/api/atom_api_native_image.cc
View file

@ -160,11 +160,10 @@ base::win::ScopedHICON ReadICOFromPath(const base::FilePath& path) {
LR_DEFAULTSIZE | LR_LOADFROMFILE)));
}
bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
void ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
// Convert the icon from the Windows specific HICON to gfx::ImageSkia.
scoped_ptr<SkBitmap> bitmap(IconUtil:: CreateSkBitmapFromHICON(icon));
scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(icon));
image->AddRepresentation(gfx::ImageSkiaRep(*bitmap, 1.0f));
return true;
}
#endif
@ -178,9 +177,9 @@ NativeImage::NativeImage(v8::Isolate* isolate, const gfx::Image& image)
#if defined(OS_WIN)
NativeImage::NativeImage(v8::Isolate* isolate, base::win::ScopedHICON&& hicon)
: hicon_(std::move(hicon)) {
if (hicon.get()) {
if (hicon_.get()) {
gfx::ImageSkia image_skia;
ReadImageSkiaFromICO(&image_skia, hicon.get());
ReadImageSkiaFromICO(&image_skia, hicon_.get());
image_ = gfx::Image(image_skia);
}
Init(isolate);
@ -189,6 +188,17 @@ NativeImage::NativeImage(v8::Isolate* isolate, base::win::ScopedHICON&& hicon)
NativeImage::~NativeImage() {}
#if defined(OS_WIN)
HICON NativeImage::GetHICON() {
if (hicon_.get())
return hicon_.get();
if (image_.IsEmpty())
return NULL;
hicon_ = std::move(IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap()));
return hicon_.get();
}
#endif
v8::Local<v8::Value> NativeImage::ToPNG(v8::Isolate* isolate) {
scoped_refptr<base::RefCountedMemory> png = image_.As1xPNGBytes();
return node::Buffer::Copy(isolate,

5
atom/common/api/atom_api_native_image.h
View file

@ -52,11 +52,12 @@ class NativeImage : public mate::Wrappable<NativeImage> {
static void BuildPrototype(v8::Isolate* isolate,
v8::Local<v8::ObjectTemplate> prototype);
const gfx::Image& image() const { return image_; }
#if defined(OS_WIN)
HICON hicon() const { return hicon_.get(); }
HICON GetHICON();
#endif
const gfx::Image& image() const { return image_; }
protected:
NativeImage(v8::Isolate* isolate, const gfx::Image& image);
#if defined(OS_WIN)