github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Only read iconPosition when icon is present

Browse Source
This commit is contained in:
Kevin Sawicki
2017-04-18 08:58:54 -07:00
parent 526d287d25
commit c32a723e29
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
atom/browser/ui/cocoa/atom_touch_bar.mm
View File

@@ -307,17 +307,18 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
settings.Get("label", &label);
button.title = base::SysUTF8ToNSString(label);
std::string iconPosition = "overlay";
settings.Get("iconPosition", &iconPosition);
gfx::Image image;
if (settings.Get("icon", &image)) {
button.image = image.AsNSImage();
std::string iconPosition;
settings.Get("iconPosition", &iconPosition);
if (iconPosition == "left") {
button.imagePosition = NSImageLeft;
button.imagePosition = NSImageLeft;
} else if (iconPosition == "right") {
button.imagePosition = NSImageRight;
button.imagePosition = NSImageRight;
} else {
button.imagePosition = NSImageOverlaps;
button.imagePosition = NSImageOverlaps;
}
}
}