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

Initial support for dynamic properties

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-28 16:08:12 -08:00
parent cbb6f8c33e
commit 98f5858b11
10 changed files with 46 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

11
atom/browser/native_window_mac.mm
View file

@ -354,7 +354,8 @@ bool ScopedDisableResize::disable_resize_ = false;
- (void)setEnableLargerThanScreen:(bool)enable;
- (void)enableWindowButtonsOffset;
- (void)resetTouchBar;
- (void)refreshTouchBarItem:(mate::Arguments*)args;
- (void)refreshTouchBarItem:(const std::string&)item_id;
@end
@implementation AtomNSWindow
@ -371,8 +372,8 @@ bool ScopedDisableResize::disable_resize_ = false;
self.touchBar = nil;
}
- (void)refreshTouchBarItem:(mate::Arguments*)args {
[atom_touch_bar_ refreshTouchBarItem:args];
- (void)refreshTouchBarItem:(const std::string&)item_id {
[atom_touch_bar_ refreshTouchBarItem:item_id];
}
- (NSTouchBar*)makeTouchBar {
@ -1381,8 +1382,8 @@ void NativeWindowMac::SetTouchBar(mate::Arguments* args) {
}
}
void NativeWindowMac::RefreshTouchBarItem(mate::Arguments* args) {
[window_ refreshTouchBarItem:args];
void NativeWindowMac::RefreshTouchBarItem(const std::string& item_id) {
[window_ refreshTouchBarItem:item_id];
}
std::vector<mate::PersistentDictionary> NativeWindowMac::GetTouchBarItems() {