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

hasTBDict -> hasItemWithID

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-28 12:39:07 -08:00
parent 48515d9ecc
commit cf7cd1f32b
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/ui/cocoa/atom_touch_bar.h
View file

@ -34,7 +34,7 @@
- (void)clear;
- (NSString*)idFromIdentifier:(NSString*)identifier withPrefix:(NSString*)prefix;
- (bool)hasTBDict:(const std::string&)id;
- (bool)hasItemWithID:(const std::string&)id;
- (NSColor*)colorFromHexColorString:(const std::string&)colorString;
// Selector actions

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

@ -150,7 +150,7 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
return [identifier substringFromIndex:[prefix length]];
}
- (bool)hasTBDict:(const std::string&)id {
- (bool)hasItemWithID:(const std::string&)id {
return item_id_map.find(id) != item_id_map.end();
}
@ -162,7 +162,7 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
- (NSTouchBarItem*)makeButtonForID:(NSString*)id
withIdentifier:(NSString*)identifier {
std::string s_id([id UTF8String]);
if (![self hasTBDict:s_id]) return nil;
if (![self hasItemWithID:s_id]) return nil;
mate::PersistentDictionary options = item_id_map[s_id];
NSCustomTouchBarItem* item = [[NSClassFromString(@"NSCustomTouchBarItem") alloc] initWithIdentifier:identifier];
@ -214,7 +214,7 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
- (NSTouchBarItem*)makeLabelForID:(NSString*)id
withIdentifier:(NSString*)identifier {
std::string s_id([id UTF8String]);
if (![self hasTBDict:s_id]) return nil;
if (![self hasItemWithID:s_id]) return nil;
mate::PersistentDictionary item = item_id_map[s_id];
NSCustomTouchBarItem* customItem = [[NSClassFromString(@"NSCustomTouchBarItem") alloc] initWithIdentifier:identifier];
@ -240,7 +240,7 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
- (NSTouchBarItem*)makeColorPickerForID:(NSString*)id
withIdentifier:(NSString*)identifier {
std::string s_id([id UTF8String]);
if (![self hasTBDict:s_id]) return nil;
if (![self hasItemWithID:s_id]) return nil;
mate::PersistentDictionary options = item_id_map[s_id];
NSColorPickerTouchBarItem* item = [[NSClassFromString(@"NSColorPickerTouchBarItem") alloc] initWithIdentifier:identifier];
@ -261,7 +261,7 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
- (NSTouchBarItem*)makeSliderForID:(NSString*)id
withIdentifier:(NSString*)identifier {
std::string s_id([id UTF8String]);
if (![self hasTBDict:s_id]) return nil;
if (![self hasItemWithID:s_id]) return nil;
mate::PersistentDictionary options = item_id_map[s_id];
NSSliderTouchBarItem* item = [[NSClassFromString(@"NSSliderTouchBarItem") alloc] initWithIdentifier:identifier];
@ -297,7 +297,7 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
- (NSTouchBarItem*)makePopoverForID:(NSString*)id
withIdentifier:(NSString*)identifier {
std::string s_id = std::string([id UTF8String]);
if (![self hasTBDict:s_id]) return nil;
if (![self hasItemWithID:s_id]) return nil;
mate::PersistentDictionary options = item_id_map[s_id];
NSPopoverTouchBarItem* item = [[NSClassFromString(@"NSPopoverTouchBarItem") alloc] initWithIdentifier:identifier];
@ -334,7 +334,7 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
- (NSTouchBarItem*)makeGroupForID:(NSString*)id
withIdentifier:(NSString*)identifier {
std::string s_id([id UTF8String]);
if (![self hasTBDict:s_id]) return nil;
if (![self hasItemWithID:s_id]) return nil;
mate::PersistentDictionary options = item_id_map[s_id];
std::vector<mate::PersistentDictionary> items;