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

🎨

Browse source
This commit is contained in:
Kevin Sawicki 2017-03-13 10:28:30 -07:00
parent 37c9d76cd5
commit 2fe21ecdd0
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -189,16 +189,16 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
details); details);
} }
- (void)scrubber:(NSScrubber *)scrubber didSelectItemAtIndex:(NSInteger)selectedIndex { - (void)scrubber:(NSScrubber*)scrubber didSelectItemAtIndex:(NSInteger)selectedIndex {
base::DictionaryValue details; base::DictionaryValue details;
details.SetInteger("selectedIndex", (long)selectedIndex); details.SetInteger("selectedIndex", selectedIndex);
details.SetString("type", "select"); details.SetString("type", "select");
window_->NotifyTouchBarItemInteraction([scrubber.identifier UTF8String], details); window_->NotifyTouchBarItemInteraction([scrubber.identifier UTF8String], details);
} }
- (void)scrubber:(NSScrubber *)scrubber didHighlightItemAtIndex:(NSInteger)highlightedIndex { - (void)scrubber:(NSScrubber*)scrubber didHighlightItemAtIndex:(NSInteger)highlightedIndex {
base::DictionaryValue details; base::DictionaryValue details;
details.SetInteger("highlightedIndex", (long)highlightedIndex); details.SetInteger("highlightedIndex", highlightedIndex);
details.SetString("type", "highlight"); details.SetString("type", "highlight");
window_->NotifyTouchBarItemInteraction([scrubber.identifier UTF8String], details); window_->NotifyTouchBarItemInteraction([scrubber.identifier UTF8String], details);
} }
@ -496,7 +496,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
} }
- (NSTouchBarItem*)makeScrubberForID:(NSString*)id - (NSTouchBarItem*)makeScrubberForID:(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;
@ -528,8 +528,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
} }
- (void)updateScrubber:(NSCustomTouchBarItem*)item - (void)updateScrubber:(NSCustomTouchBarItem*)item
withSettings:(const mate::PersistentDictionary&)settings { withSettings:(const mate::PersistentDictionary&)settings {
NSScrubber* scrubber = item.view; NSScrubber* scrubber = item.view;
std::vector<mate::PersistentDictionary> items; std::vector<mate::PersistentDictionary> items;