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

Use NSTouchBar itemForIdentifier to lookup existing item

Browse source
This commit is contained in:
Kevin Sawicki 2017-03-02 10:23:24 -08:00
parent 8d716e8b17
commit d1edd80ef8
4 changed files with 85 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/native_window_mac.mm
View file

@ -376,8 +376,8 @@ bool ScopedDisableResize::disable_resize_ = false;
}
- (void)refreshTouchBarItem:(const std::string&)item_id {
if (atom_touch_bar_)
[atom_touch_bar_ refreshTouchBarItem:item_id];
if (atom_touch_bar_ && self.touchBar)
[atom_touch_bar_ refreshTouchBarItem:self.touchBar id:item_id];
}
- (NSTouchBar*)makeTouchBar {