From 526d287d25787f657b015c9f379ee51339de2cb3 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Mon, 17 Apr 2017 12:30:55 +1200 Subject: [PATCH] Make iconPosition non-breaking by defaulting to overlay --- atom/browser/ui/cocoa/atom_touch_bar.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/atom/browser/ui/cocoa/atom_touch_bar.mm b/atom/browser/ui/cocoa/atom_touch_bar.mm index 95f36cf02d02..97eebf73f688 100644 --- a/atom/browser/ui/cocoa/atom_touch_bar.mm +++ b/atom/browser/ui/cocoa/atom_touch_bar.mm @@ -307,17 +307,17 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item"; settings.Get("label", &label); button.title = base::SysUTF8ToNSString(label); - std::string iconPosition = "left"; + std::string iconPosition = "overlay"; settings.Get("iconPosition", &iconPosition); gfx::Image image; if (settings.Get("icon", &image)) { button.image = image.AsNSImage(); - if (iconPosition == "overlay") { - button.imagePosition = NSImageOverlaps; + if (iconPosition == "left") { + button.imagePosition = NSImageLeft; } else if (iconPosition == "right") { button.imagePosition = NSImageRight; } else { - button.imagePosition = NSImageLeft; + button.imagePosition = NSImageOverlaps; } } }