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

Rename to touch_bar_helper_ to differentiate from touchBar property

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-28 13:53:00 -08:00
parent 14ef5c5957
commit b39b49a15a
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
atom/browser/native_window_mac.mm
View file

@ -336,10 +336,11 @@ bool ScopedDisableResize::disable_resize_ = false;
@end
@interface AtomNSWindow : EventDispatchingWindow<QLPreviewPanelDataSource, QLPreviewPanelDelegate> {
@interface AtomNSWindow : EventDispatchingWindow<QLPreviewPanelDataSource, QLPreviewPanelDelegate, NSTouchBarDelegate> {
@private
atom::NativeWindowMac* shell_;
bool enable_larger_than_screen_;
base::scoped_nsobject<AtomTouchBar> touch_bar_helper_;
CGFloat windowButtonsInterButtonSpacing_;
}
@property BOOL acceptsFirstMouse;
@ -356,11 +357,7 @@ bool ScopedDisableResize::disable_resize_ = false;
- (void)refreshTouchBarItem:(mate::Arguments*)args;
@end
@interface AtomNSWindow () <NSTouchBarDelegate>
@end
@implementation AtomNSWindow
base::scoped_nsobject<AtomTouchBar> touch_bar_;
- (void)setShell:(atom::NativeWindowMac*)shell {
shell_ = shell;
@ -375,16 +372,17 @@ bool ScopedDisableResize::disable_resize_ = false;
}
- (void)refreshTouchBarItem:(mate::Arguments*)args {
[touch_bar_ refreshTouchBarItem:args];
[touch_bar_helper_ refreshTouchBarItem:args];
}
- (NSTouchBar*)makeTouchBar {
touch_bar_.reset([[AtomTouchBar alloc] initWithDelegate:self window:shell_]);
return [touch_bar_ makeTouchBarFromItemOptions:shell_->GetTouchBarItems()];
touch_bar_helper_.reset([[AtomTouchBar alloc] initWithDelegate:self window:shell_]);
return [touch_bar_helper_ makeTouchBarFromItemOptions:shell_->GetTouchBarItems()];
}
- (nullable NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier {
return [touch_bar_ makeItemForIdentifier:identifier];
- (nullable NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier {
return [touch_bar_helper_ makeItemForIdentifier:identifier];
}
// NSWindow overrides.