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

Add Slider item type and add options to the button type

Browse source
This commit is contained in:
Samuel Attard 2016-11-28 21:43:39 +11:00 • committed by Kevin Sawicki
parent 18c7c3ece8
commit c92c4138a8
5 changed files with 191 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/native_window_mac.h
View file

@ -14,6 +14,7 @@
#include "base/mac/scoped_nsobject.h"
#include "content/public/browser/render_widget_host.h"
#include "native_mate/constructor.h"
#include "native_mate/persistent_dictionary.h"
@class AtomNSWindow;
@class AtomNSWindowDelegate;
@ -103,7 +104,7 @@ class NativeWindowMac : public NativeWindow,
void SetVibrancy(const std::string& type) override;
void DestroyTouchBar() override;
void SetTouchBar(mate::Arguments* args) override;
std::vector<mate::Dictionary> GetTouchBarItems();
std::vector<mate::PersistentDictionary> GetTouchBarItems();
// content::RenderWidgetHost::InputEventObserver:
void OnInputEvent(const blink::WebInputEvent& event) override;
@ -158,7 +159,7 @@ class NativeWindowMac : public NativeWindow,
base::scoped_nsobject<AtomNSWindow> window_;
base::scoped_nsobject<AtomNSWindowDelegate> window_delegate_;
std::vector<mate::Dictionary> touch_bar_items_;
std::vector<mate::PersistentDictionary> touch_bar_items_;
// Event monitor for scroll wheel event.
id wheel_event_monitor_;