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

Store event listeners in each TouchBar class

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-28 15:37:15 -08:00
parent 1972e2eff9
commit cbb6f8c33e
8 changed files with 104 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -282,9 +282,9 @@ void Window::OnExecuteWindowsCommand(const std::string& command_name) {
Emit("app-command", command_name);
}
void Window::OnTouchBarItemResult(const std::string& item_type,
const std::vector<std::string>& args) {
Emit("-touch-bar-interaction", item_type, args);
void Window::OnTouchBarItemResult(const std::string& item_id,
const base::DictionaryValue& details) {
Emit("-touch-bar-interaction", item_id, details);
}
#if defined(OS_WIN)

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

@ -85,8 +85,8 @@ class Window : public mate::TrackableObject<Window>,
void OnRendererUnresponsive() override;
void OnRendererResponsive() override;
void OnExecuteWindowsCommand(const std::string& command_name) override;
void OnTouchBarItemResult(const std::string& item_type,
const std::vector<std::string>& args) override;
void OnTouchBarItemResult(const std::string& item_id,
const base::DictionaryValue& details) override;
#if defined(OS_WIN)
void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) override;

6
atom/browser/native_window.cc
View file

@ -576,10 +576,10 @@ void NativeWindow::NotifyWindowExecuteWindowsCommand(
}
void NativeWindow::NotifyTouchBarItemInteraction(
const std::string& type,
const std::vector<std::string>& args) {
const std::string& item_id,
const base::DictionaryValue& details) {
for (NativeWindowObserver& observer : observers_)
observer.OnTouchBarItemResult(type, args);
observer.OnTouchBarItemResult(item_id, details);
}
#if defined(OS_WIN)

4
atom/browser/native_window.h
View file

@ -234,8 +234,8 @@ class NativeWindow : public base::SupportsUserData,
void NotifyWindowEnterHtmlFullScreen();
void NotifyWindowLeaveHtmlFullScreen();
void NotifyWindowExecuteWindowsCommand(const std::string& command);
void NotifyTouchBarItemInteraction(const std::string& item_type,
const std::vector<std::string>& args);
void NotifyTouchBarItemInteraction(const std::string& item_id,
const base::DictionaryValue& details);
#if defined(OS_WIN)
void NotifyWindowMessage(UINT message, WPARAM w_param, LPARAM l_param);

5
atom/browser/native_window_observer.h
View file

@ -9,6 +9,7 @@
#include <vector>
#include "base/strings/string16.h"
#include "base/values.h"
#include "ui/base/window_open_disposition.h"
#include "url/gurl.h"
@ -71,8 +72,8 @@ class NativeWindowObserver {
virtual void OnWindowLeaveFullScreen() {}
virtual void OnWindowEnterHtmlFullScreen() {}
virtual void OnWindowLeaveHtmlFullScreen() {}
virtual void OnTouchBarItemResult(const std::string& item_type,
const std::vector<std::string>& args) {}
virtual void OnTouchBarItemResult(const std::string& item_id,
const base::DictionaryValue& details) {}
// Called when window message received
#if defined(OS_WIN)

33
atom/browser/ui/cocoa/atom_touch_bar.mm
View file

@ -131,20 +131,30 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
}
- (void)buttonAction:(id)sender {
NSString* item_id = [NSString stringWithFormat:@"%@.%d", ButtonIdentifier, (int)((NSButton*)sender).tag];
window_->NotifyTouchBarItemInteraction("button", { std::string([item_id UTF8String]) });
NSString* item_id = [NSString stringWithFormat:@"%ld", ((NSButton*)sender).tag];
window_->NotifyTouchBarItemInteraction([item_id UTF8String],
base::DictionaryValue());
}
- (void)colorPickerAction:(id)sender {
NSString* item_id = ((NSColorPickerTouchBarItem*)sender).identifier;
NSString* identifier = ((NSColorPickerTouchBarItem*)sender).identifier;
NSString* item_id = [self idFromIdentifier:identifier
withPrefix:ColorPickerIdentifier];
NSColor* color = ((NSColorPickerTouchBarItem*)sender).color;
std::string hex_color = atom::ToRGBHex(skia::NSDeviceColorToSkColor(color));
window_->NotifyTouchBarItemInteraction("color_picker", { std::string([item_id UTF8String]), hex_color });
base::DictionaryValue details;
details.SetString("color", hex_color);
window_->NotifyTouchBarItemInteraction([item_id UTF8String], details);
}
- (void)sliderAction:(id)sender {
NSString* item_id = ((NSSliderTouchBarItem*)sender).identifier;
window_->NotifyTouchBarItemInteraction("slider", { std::string([item_id UTF8String]), std::to_string([((NSSliderTouchBarItem*)sender).slider intValue]) });
NSString* identifier = ((NSSliderTouchBarItem*)sender).identifier;
NSString* item_id = [self idFromIdentifier:identifier
withPrefix:SliderIdentifier];
base::DictionaryValue details;
details.SetInteger("value",
[((NSSliderTouchBarItem*)sender).slider intValue]);
window_->NotifyTouchBarItemInteraction([item_id UTF8String], details);
}
- (NSString*)idFromIdentifier:(NSString*)identifier withPrefix:(NSString*)prefix {
@ -326,9 +336,10 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
item.showsCloseButton = showCloseButton;
}
std::vector<mate::PersistentDictionary> touchBar;
if (options.Get("touchBar", &touchBar)) {
item.popoverTouchBar = [self touchBarFromItemIdentifiers:[self identifierArrayFromDicts:touchBar]];
mate::PersistentDictionary child;
std::vector<mate::PersistentDictionary> items;
if (options.Get("child", &child) && child.Get("ordereredItems", &items)) {
item.popoverTouchBar = [self touchBarFromItemIdentifiers:[self identifierArrayFromDicts:items]];
}
}
@ -338,8 +349,10 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
if (![self hasItemWithID:s_id]) return nil;
mate::PersistentDictionary options = item_id_map[s_id];
mate::PersistentDictionary child;
if (!options.Get("child", &child)) return nil;
std::vector<mate::PersistentDictionary> items;
if (!options.Get("items", &items)) return nil;
if (!child.Get("ordereredItems", &items)) return nil;
NSMutableArray* generatedItems = [[NSMutableArray alloc] init];
NSMutableArray* identList = [self identifierArrayFromDicts:items];