Commit graph

61 commits

Author SHA1 Message Date
Cheng Zhao
b57665330c Merge branch 'master' into chrome52 2016-07-21 05:34:36 -06:00
Haojian Wu
4ac4dacffe Some manual change to for-ranged loop.
Use "const auto&" where possible.
2016-07-10 15:57:51 +02:00
Haojian Wu
55b3f1936f Modernize to C++11: Use for-range loop. 2016-07-10 13:33:15 +02:00
Cheng Zhao
1ba3907038 Update to API changes of Chrome 52 2016-07-04 15:32:43 +09:00
Milan Burda
a886261518 Fix crash in ReadImageSkiaFromICO when CreateSkBitmapFromHICON fails 2016-06-28 12:17:05 -07:00
Kevin Sawicki
e9222583cb toPng/toJpeg -> toPNG/toJPEG 2016-06-22 15:47:42 -07:00
Cheng Zhao
7ba391da7c Update to API changes of Chrome 51 2016-05-23 10:59:39 +09:00
Cheng Zhao
a93c9462ed Add BrowserWindow.setIcon 2016-05-20 22:22:15 +09:00
Cheng Zhao
ea2807c890 Make it possible to get different size of icons from ICO 2016-05-20 17:51:05 +09:00
Cheng Zhao
0059e7bcf9 Use LoadIconMetric to load correct icon 2016-05-20 17:12:07 +09:00
Cheng Zhao
9e26e5c121 Load HICON directly in NotifyIcon 2016-05-20 16:55:22 +09:00
Cheng Zhao
adfd99f5f0 Convert to mate::Handle<NativeImage> instead of gfx::Image 2016-05-20 16:14:40 +09:00
Cheng Zhao
7c34d8333c Store ico image in HCION 2016-05-20 11:31:02 +09:00
Cheng Zhao
73223fe5c3 Upgrade to Node v6 2016-05-13 11:12:01 +09:00
Cheng Zhao
446da677b5 Remove NativeImage.toDataUrl 2016-05-06 10:12:56 -07:00
Cheng Zhao
2ae52d0ff4 Make Wrappable a template class 2016-04-25 10:17:54 +09:00
Cheng Zhao
939d69df6e Throw error with message of "Not implemented". 2016-03-17 22:01:31 +09:00
Paul Betts
e94da877c2 Fix compile oopses on non-OS X 2016-03-16 12:49:34 -07:00
Paul Betts
d344c1e408 AsNativeRepresentation => getNativeHandle 2016-03-14 19:50:31 -07:00
Paul Betts
e3e6cd6fd8 Remove type parameter 2016-03-14 19:48:40 -07:00
Paul Betts
63d9174822 🔥 build warning on Win32 2016-03-13 20:27:44 -07:00
Paul Betts
7233c83874 Linting 2016-03-13 20:18:03 -07:00
Paul Betts
262abc43f8 First hack at being able to return NSImage pointers 2016-03-13 20:08:53 -07:00
Paul Betts
f4ec369873 More boring fixups 2016-03-10 17:06:22 +09:00
Kevin Sawicki
022c2c0d8c absolute_path -> normalize_path 2016-03-07 16:45:14 -08:00
Kevin Sawicki
0dba0b9cad MakePathAbsolute -> NormalizePath 2016-03-07 16:45:14 -08:00
Kevin Sawicki
9c88a5c1ab Check ReferencesParent before calling MakeAbsoluteFilePath 2016-03-07 16:45:14 -08:00
Kevin Sawicki
145d5abe80 Mention explicit using original path on failures 2016-03-07 16:45:14 -08:00
Kevin Sawicki
b90c0c7895 Use MakeAbsoluteFilePath when creating native image from path 2016-03-07 16:45:13 -08:00
Cheng Zhao
73e7773d84 Update to API changes of Chrome 47 2015-12-07 19:56:23 +08:00
Cheng Zhao
fbb8e61958 Replace "Url" in API names with "URL" 2015-11-13 16:03:40 +08:00
Cheng Zhao
45491ca7ab Fix API changes 2015-09-03 17:50:23 +09:00
Cheng Zhao
9212a1db8e Merge branch 'master' into chrome44 2015-08-21 19:29:34 +08:00
Cheng Zhao
82fc98848a win: Move the ICO reading code into a separate function 2015-08-21 12:06:38 +08:00
Eran Tiktin
f386342a7c Fix memory leak and confirming to style guide
Fixed according to @hokein 's suggestions.
2015-08-20 19:26:20 +03:00
Eran Tiktin
2bc087b5d5 Merge branch 'master' into nativeimage_ico_support_windows 2015-08-20 17:11:52 +03:00
Haojian Wu
11ffb9dfb6 Fix node::Buffer API changes. 2015-08-11 09:48:29 +08:00
Eran Tiktin
850edd546c Added support for reading .ico from asar
If the file path is to an asar archive, we extract the file to temp, so
LoadImage can load it
2015-08-08 21:57:29 +03:00
Eran Tiktin
ab1b4c46b2 Converted tabs to spaces 2015-08-08 18:31:12 +03:00
Eran Tiktin
bec7a399cb Add support for using .ico icon files on Windows
NativeImage::CreateFromPath now supports loading .ico icon files on
Windows.
2015-08-08 17:58:05 +03:00
Cheng Zhao
2f04f76e69 ImageSkiaRep doesn't release memory 2015-08-05 15:49:37 +08:00
Cheng Zhao
9afa94f4b8 win: Implement double-clicked event 2015-07-29 12:36:01 +08:00
Cheng Zhao
2c97cd64cf Minor style fix for #2352 2015-07-29 11:48:40 +08:00
Nishanth Shanmugham
9211109088 Add NativeImage.IsTemplateImage method
* Rename internal function that determines template image filename patterns
* Add the new IsTemplateMethod
2015-07-26 21:58:48 -07:00
Cheng Zhao
d78efe7c22 Use Local instead of Handle 2015-05-22 19:11:22 +08:00
Cheng Zhao
91c9f590dd Remove the NativeImage::MakeTemplateImage method
Is duplicate with SetTemplateImage.
2015-04-13 11:53:24 +08:00
deepak1556
efd294d69d nativeImage: adding setTemplateImage method 2015-04-08 14:39:14 +05:30
Cheng Zhao
3678f13dfb Make NativeImage work with asar archive 2015-02-12 19:34:21 +08:00
Cheng Zhao
c8738a88a4 Add nativeImage.createFromBuffer() 2015-02-12 15:19:05 +08:00
Cheng Zhao
353b485202 Add NativeImage.toDataUrl() 2015-02-12 14:32:51 +08:00