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

Check that atom_touch_bar_ is set

Browse source
This commit is contained in:
Kevin Sawicki 2017-03-01 15:29:34 -08:00
commit 5fe3ac60fa
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/native_window_mac.mm
View file

@ -376,16 +376,20 @@ bool ScopedDisableResize::disable_resize_ = false;
} }
- (void)refreshTouchBarItem:(const std::string&)item_id { - (void)refreshTouchBarItem:(const std::string&)item_id {
if (atom_touch_bar_)
[atom_touch_bar_ refreshTouchBarItem:item_id]; [atom_touch_bar_ refreshTouchBarItem:item_id];
} }
- (NSTouchBar*)makeTouchBar { - (NSTouchBar*)makeTouchBar {
if (atom_touch_bar_)
return [atom_touch_bar_ makeTouchBar]; return [atom_touch_bar_ makeTouchBar];
else
return nil;
} }
- (nullable NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar - (nullable NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier { makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier {
if (touchBar) if (touchBar && atom_touch_bar_)
return [atom_touch_bar_ makeItemForIdentifier:identifier]; return [atom_touch_bar_ makeItemForIdentifier:identifier];
else else
return nil; return nil;