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

Use icon for consistency with other touch bar APIs

Browse source
This commit is contained in:
Kevin Sawicki 2017-03-15 09:33:11 -07:00
parent 49d48a4eb0
commit 466c39ed19
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -601,7 +601,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
NSScrubberImageItemView* view = [scrubber makeItemWithIdentifier:ImageScrubberItemIdentifier NSScrubberImageItemView* view = [scrubber makeItemWithIdentifier:ImageScrubberItemIdentifier
owner:self]; owner:self];
gfx::Image image; gfx::Image image;
if (item.Get("image", &image)) { if (item.Get("icon", &image)) {
view.image = image.AsNSImage(); view.image = image.AsNSImage();
} }
itemView = view; itemView = view;

2
docs/api/structures/scrubber-item.md
View file

@ -1,4 +1,4 @@
# ScrubberItem Object # ScrubberItem Object
* `label` String - (Optional) The text to appear in this item * `label` String - (Optional) The text to appear in this item
* `image` NativeImage - (Optional) The image to appear in this item * `icon` NativeImage - (Optional) The image to appear in this item