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

Add clipboard.readImage method

Browse source
This commit is contained in:
Cheng Zhao 2015-02-11 14:55:44 +08:00
parent 878d25e91e
commit b76615f3e7
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
atom/common/api/atom_api_clipboard.cc
View file

@ -5,10 +5,13 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "atom/common/native_mate_converters/image_converter.h"
#include "atom/common/native_mate_converters/string16_converter.h" #include "atom/common/native_mate_converters/string16_converter.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/clipboard.h"
#include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/clipboard/scoped_clipboard_writer.h"
#include "ui/gfx/image/image.h"
#include "atom/common/node_includes.h" #include "atom/common/node_includes.h"
@ -16,8 +19,7 @@ namespace mate {
template<> template<>
struct Converter<ui::ClipboardType> { struct Converter<ui::ClipboardType> {
static bool FromV8(v8::Isolate* isolate, static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
v8::Handle<v8::Value> val,
ui::ClipboardType* out) { ui::ClipboardType* out) {
std::string type; std::string type;
if (!Converter<std::string>::FromV8(isolate, val, &type)) if (!Converter<std::string>::FromV8(isolate, val, &type))
@ -62,6 +64,11 @@ void WriteText(const base::string16& text, ui::ClipboardType type) {
writer.WriteText(text); writer.WriteText(text);
} }
gfx::Image ReadImage(ui::ClipboardType type) {
SkBitmap bitmap = ui::Clipboard::GetForCurrentThread()->ReadImage(type);
return gfx::Image::CreateFrom1xBitmap(bitmap);
}
void Clear(ui::ClipboardType type) { void Clear(ui::ClipboardType type) {
ui::Clipboard::GetForCurrentThread()->Clear(type); ui::Clipboard::GetForCurrentThread()->Clear(type);
} }
@ -73,6 +80,7 @@ void Initialize(v8::Handle<v8::Object> exports, v8::Handle<v8::Value> unused,
dict.SetMethod("_read", &Read); dict.SetMethod("_read", &Read);
dict.SetMethod("_readText", &ReadText); dict.SetMethod("_readText", &ReadText);
dict.SetMethod("_writeText", &WriteText); dict.SetMethod("_writeText", &WriteText);
dict.SetMethod("_readImage", &ReadImage);
dict.SetMethod("_clear", &Clear); dict.SetMethod("_clear", &Clear);
} }

1
atom/common/api/lib/clipboard.coffee
View file

@ -9,4 +9,5 @@ else
read: (format, type='standard') -> binding._read format, type read: (format, type='standard') -> binding._read format, type
readText: (type='standard') -> binding._readText type readText: (type='standard') -> binding._readText type
writeText: (text, type='standard') -> binding._writeText text, type writeText: (text, type='standard') -> binding._writeText text, type
readImage: (type='standard') -> binding._readImage type
clear: (type='standard') -> binding._clear type clear: (type='standard') -> binding._clear type