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

Expose NativeWindow.setThumbarButtons API to all platforms.

Browse source
This commit is contained in:
Haojian Wu 2015-08-05 22:26:18 +08:00
commit 2f1cb8b52a
10 changed files with 35 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

16
atom/browser/api/atom_api_window.cc
View file

@ -20,17 +20,12 @@
#include "atom/common/node_includes.h"
#if defined(OS_WIN)
#include "atom/browser/ui/win/thumbar_host.h"
#endif
namespace mate {
#if defined(OS_WIN)
template<>
struct Converter<atom::ThumbarHost::ThumbarButton> {
struct Converter<atom::NativeWindow::ThumbarButton> {
static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
atom::ThumbarHost::ThumbarButton* out) {
atom::NativeWindow::ThumbarButton* out) {
mate::Dictionary dict;
if (!ConvertFromV8(isolate, val, &dict))
return false;
@ -40,7 +35,6 @@ struct Converter<atom::ThumbarHost::ThumbarButton> {
return dict.Get("icon", &(out->icon));
}
};
#endif
} // namespace mate
@ -437,12 +431,10 @@ void Window::SetOverlayIcon(const gfx::Image& overlay,
window_->SetOverlayIcon(overlay, description);
}
#if defined(OS_WIN)
void Window::SetThumbarButtons(
const std::vector<ThumbarHost::ThumbarButton>& buttons) {
const std::vector<NativeWindow::ThumbarButton>& buttons) {
window_->SetThumbarButtons(buttons);
}
#endif
void Window::SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> value) {
mate::Handle<Menu> menu;
@ -569,9 +561,7 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("capturePage", &Window::CapturePage)
.SetMethod("setProgressBar", &Window::SetProgressBar)
.SetMethod("setOverlayIcon", &Window::SetOverlayIcon)
#if defined(OS_WIN)
.SetMethod("setThumbarButtons", &Window::SetThumbarButtons)
#endif
.SetMethod("setMenu", &Window::SetMenu)
.SetMethod("setAutoHideMenuBar", &Window::SetAutoHideMenuBar)
.SetMethod("isMenuBarAutoHide", &Window::IsMenuBarAutoHide)

9
atom/browser/api/atom_api_window.h
View file

@ -11,13 +11,10 @@
#include "base/memory/scoped_ptr.h"
#include "ui/gfx/image/image.h"
#include "atom/browser/api/trackable_object.h"
#include "atom/browser/native_window.h"
#include "atom/browser/native_window_observer.h"
#include "native_mate/handle.h"
#if defined(OS_WIN)
#include "atom/browser/ui/win/thumbar_host.h"
#endif
class GURL;
namespace gfx {
@ -133,10 +130,8 @@ class Window : public mate::TrackableObject<Window>,
void SetProgressBar(double progress);
void SetOverlayIcon(const gfx::Image& overlay,
const std::string& description);
#if defined(OS_WIN)
void SetThumbarButtons(
const std::vector<ThumbarHost::ThumbarButton>& buttons);
#endif
const std::vector<NativeWindow::ThumbarButton>& buttons);
void SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> menu);
void SetAutoHideMenuBar(bool auto_hide);
bool IsMenuBarAutoHide();