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

Reset helper when makeTouchBar is called

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-28 13:50:16 -08:00
parent ca29ec0101
commit 14ef5c5957
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
atom/browser/native_window_mac.mm
View file

@ -352,9 +352,8 @@ bool ScopedDisableResize::disable_resize_ = false;
- (void)setShell:(atom::NativeWindowMac*)shell; - (void)setShell:(atom::NativeWindowMac*)shell;
- (void)setEnableLargerThanScreen:(bool)enable; - (void)setEnableLargerThanScreen:(bool)enable;
- (void)enableWindowButtonsOffset; - (void)enableWindowButtonsOffset;
- (void)reloadTouchBar;
- (void)refreshTouchBarItem:(mate::Arguments*)args;
- (void)resetTouchBar; - (void)resetTouchBar;
- (void)refreshTouchBarItem:(mate::Arguments*)args;
@end @end
@interface AtomNSWindow () <NSTouchBarDelegate> @interface AtomNSWindow () <NSTouchBarDelegate>
@ -365,7 +364,6 @@ bool ScopedDisableResize::disable_resize_ = false;
- (void)setShell:(atom::NativeWindowMac*)shell { - (void)setShell:(atom::NativeWindowMac*)shell {
shell_ = shell; shell_ = shell;
touch_bar_.reset([[AtomTouchBar alloc] initWithDelegate:self window:shell]);
} }
- (void)setEnableLargerThanScreen:(bool)enable { - (void)setEnableLargerThanScreen:(bool)enable {
@ -376,16 +374,12 @@ bool ScopedDisableResize::disable_resize_ = false;
self.touchBar = nil; self.touchBar = nil;
} }
- (void)reloadTouchBar {
[touch_bar_ clear];
self.touchBar = nil;
}
- (void)refreshTouchBarItem:(mate::Arguments*)args { - (void)refreshTouchBarItem:(mate::Arguments*)args {
[touch_bar_ refreshTouchBarItem:args]; [touch_bar_ refreshTouchBarItem:args];
} }
- (NSTouchBar*)makeTouchBar { - (NSTouchBar*)makeTouchBar {
touch_bar_.reset([[AtomTouchBar alloc] initWithDelegate:self window:shell_]);
return [touch_bar_ makeTouchBarFromItemOptions:shell_->GetTouchBarItems()]; return [touch_bar_ makeTouchBarFromItemOptions:shell_->GetTouchBarItems()];
} }
@ -1377,6 +1371,7 @@ void NativeWindowMac::SetVibrancy(const std::string& type) {
} }
void NativeWindowMac::DestroyTouchBar() { void NativeWindowMac::DestroyTouchBar() {
touch_bar_items_.clear();
[window_ resetTouchBar]; [window_ resetTouchBar];
} }
@ -1384,7 +1379,7 @@ void NativeWindowMac::SetTouchBar(mate::Arguments* args) {
std::vector<mate::PersistentDictionary> items; std::vector<mate::PersistentDictionary> items;
if (args->GetNext(&items)) { if (args->GetNext(&items)) {
touch_bar_items_ = items; touch_bar_items_ = items;
[window_ reloadTouchBar]; [window_ resetTouchBar];
} }
} }

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

@ -161,7 +161,7 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
} }
- (NSTouchBarItem*)makeButtonForID:(NSString*)id - (NSTouchBarItem*)makeButtonForID:(NSString*)id
withIdentifier:(NSString*)identifier { withIdentifier:(NSString*)identifier {
std::string s_id([id UTF8String]); std::string s_id([id UTF8String]);
if (![self hasItemWithID:s_id]) return nil; if (![self hasItemWithID:s_id]) return nil;
@ -213,7 +213,7 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
} }
- (NSTouchBarItem*)makeLabelForID:(NSString*)id - (NSTouchBarItem*)makeLabelForID:(NSString*)id
withIdentifier:(NSString*)identifier { withIdentifier:(NSString*)identifier {
std::string s_id([id UTF8String]); std::string s_id([id UTF8String]);
if (![self hasItemWithID:s_id]) return nil; if (![self hasItemWithID:s_id]) return nil;
@ -260,7 +260,7 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
} }
- (NSTouchBarItem*)makeSliderForID:(NSString*)id - (NSTouchBarItem*)makeSliderForID:(NSString*)id
withIdentifier:(NSString*)identifier { withIdentifier:(NSString*)identifier {
std::string s_id([id UTF8String]); std::string s_id([id UTF8String]);
if (![self hasItemWithID:s_id]) return nil; if (![self hasItemWithID:s_id]) return nil;
@ -296,7 +296,7 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
} }
- (NSTouchBarItem*)makePopoverForID:(NSString*)id - (NSTouchBarItem*)makePopoverForID:(NSString*)id
withIdentifier:(NSString*)identifier { withIdentifier:(NSString*)identifier {
std::string s_id([id UTF8String]); std::string s_id([id UTF8String]);
if (![self hasItemWithID:s_id]) return nil; if (![self hasItemWithID:s_id]) return nil;