[Mac][MC] Adjust the size of the status item view based on the unread count.

ui/message_center/cocoa/status_item_view.mm

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ui/message_center/cocoa/status_item_view.h"
 
 #include <cmath>
 
 #include "base/format_macros.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
-// The width of the status bar.
-const CGFloat kStatusItemLength = 45;
+// The width of the status bar item when it's just the icon.
+const CGFloat kStatusItemLengthIcon = 27;
+
+// The width of the status bar item when it's the icon and a number.
+const CGFloat kStatusItemLengthNumber = 35;
+
+// The width of the status bar item when it's the icon, a number, and a + sign.

[sail, 2013/05/28 19:40:22]

I was a little surprised by this approach. I thought you'd size the view based
on the width of the unread count string.

I think this will work though since numbers and the plus sign should be the same
in all locales.

+const CGFloat kStatusItemLengthNumberPlus = 43;
 
 // The amount of space between the edge of the status item and where the icon
 // should start drawing.
-const CGFloat kInset = 6;
+const CGFloat kInset = 5;
+
+// The amount of space between the icon and the unread count number.
+const CGFloat kUnreadCountLeftMargin = 3;
+
+// The lower-left Y coordinate of the unread count number.
+const CGFloat kUnreadCountMinY = 4;
 
 }  // namespace
 
 @implementation MCStatusItemView
 
 @synthesize unreadCount = unreadCount_;
 @synthesize highlight = highlight_;
 
 - (id)initWithStatusItem:(NSStatusItem*)item {
   CGFloat thickness = [[item statusBar] thickness];
-  NSRect frame = NSMakeRect(0, 0, kStatusItemLength, thickness);
+  NSRect frame = NSMakeRect(0, 0, kStatusItemLengthIcon, thickness);
   if ((self = [super initWithFrame:frame])) {
     statusItem_.reset([item retain]);
     [statusItem_ setView:self];
   }
   return self;
 }
 
 - (message_center::StatusItemClickedCallack)callback {
   return callback_.get();
 }
 
 - (void)setCallback:(message_center::StatusItemClickedCallack)callback {
   callback_.reset(Block_copy(callback));
 }
 
 - (void)setUnreadCount:(size_t)unreadCount {
   unreadCount_ = unreadCount;
+
+  NSRect frame = [self frame];
+  if (unreadCount_ == 0)
+    frame.size.width = kStatusItemLengthIcon;
+  else if (unreadCount_ < 10)
+    frame.size.width = kStatusItemLengthNumber;
+  else
+    frame.size.width = kStatusItemLengthNumberPlus;
+  [self setFrame:frame];
+
   [self setNeedsDisplay:YES];
 }
 
 - (void)setHighlight:(BOOL)highlight {
   highlight_ = highlight;
   [self setNeedsDisplay:YES];
 }
 
 - (void)mouseDown:(NSEvent*)event {
   DCHECK(!inMouseEventSequence_);
@@ skipping 40 matching lines @@
     else
       count = [NSString stringWithFormat:@"%"PRIuS, unreadCount_];
 
     NSColor* fontColor = highlight ? [NSColor whiteColor]
                                    : [NSColor blackColor];
     NSDictionary* attributes = @{
         NSFontAttributeName: [NSFont fontWithName:@"Helvetica-Bold" size:12],
         NSForegroundColorAttributeName: fontColor,
     };
 
-    // Center the string inside the remaining space of the status item.
-    NSSize stringSize = [count sizeWithAttributes:attributes];
-    NSRect iconSlice, textSlice;
-    NSDivideRect(frame, &iconSlice, &textSlice, NSMaxX(drawRect), NSMinXEdge);
     NSPoint countPoint = NSMakePoint(
-        floorf(NSMinX(textSlice) + (NSWidth(textSlice) - stringSize.width) / 2),
-        floorf(NSMinY(textSlice) +
-               (NSHeight(textSlice) - stringSize.height) / 2));
-
+        NSMaxX(drawRect) + kUnreadCountLeftMargin, kUnreadCountMinY);
     [count drawAtPoint:countPoint withAttributes:attributes];
   }
 }
 
 @end