[Mac][MC] Implement notification updates and relayouts.

ui/message_center/cocoa/notification_controller.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/notification_controller.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #import "ui/base/cocoa/hover_image_button.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_constants.h"
 #include "ui/message_center/notification.h"
 
 namespace {
 
 // Compensates for padding already provided by UI elements involved.
 const int kTextTopPaddingAdjustment = -6;
 
 }  // namespace
+
 @interface MCNotificationController (Private)
 // Configures a NSBox to be borderless, titleless, and otherwise appearance-
 // free.
 - (void)configureCustomBox:(NSBox*)box;
 
 // Initializes the icon_ ivar and returns the view to insert into the hierarchy.
 - (NSView*)createImageView;
 
 // Initializes the closeButton_ ivar with the configured button.
 - (void)configureCloseButtonInFrame:(NSRect)rootFrame;
@@ skipping 41 matching lines @@
 
   // Create the close button.
   [self configureCloseButtonInFrame:rootFrame];
   [rootView addSubview:closeButton_];
 
   // Create the title.
   [self configureTitleInFrame:rootFrame];
   [rootView addSubview:title_];
 
   // Create the message body.
-  [self configureBodyInFrame:rootFrame maxY:NSMinY([title_ frame])];
+  [self configureBodyInFrame:rootFrame];
   [rootView addSubview:message_];
 
+  // Populate the data.
+  [self updateNotification:notification_];
+}
+
+- (NSRect)updateNotification:(const message_center::Notification*)notification {
+  DCHECK_EQ(notification->id(), notificationID_);
+  notification_ = notification;
+
+  NSRect rootFrame = NSMakeRect(0, 0,
+      message_center::kNotificationPreferredImageSize,
+      message_center::kNotificationIconSize);
+
+  // Update the icon.
+  [icon_ setImage:notification_->icon().AsNSImage()];
+
+  // Set the title and recalculate the frame.
+  [title_ setStringValue:base::SysUTF16ToNSString(notification_->title())];
+  [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:title_];
+  NSRect titleFrame = [title_ frame];
+  titleFrame.origin.y = NSMaxY(rootFrame) - message_center::kTextTopPadding -
+                        NSHeight(titleFrame);
+
+  // Set the message and recalculate the frame.
+  [message_ setStringValue:base::SysUTF16ToNSString(notification_->message())];
+  [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:message_];
+  NSRect messageFrame = [message_ frame];
+  messageFrame.origin.y = NSMinY(titleFrame) - message_center::kTextTopPadding -
+                          NSHeight(messageFrame);
+  messageFrame.size.height = NSHeight([message_ frame]);
+
   // In this basic notification UI, the message body is the bottom-most
   // vertical element. If it is out of the rootView's bounds, resize the view.
-  if (NSMinY([message_ frame]) <
+  if (NSMinY(messageFrame) <
           message_center::kTextTopPadding + kTextTopPaddingAdjustment) {
-    rootFrame.size.height += message_center::kTextTopPadding +
-                             kTextTopPaddingAdjustment -
-                             NSMinY([message_ frame]);
+    CGFloat delta = message_center::kTextTopPadding +
+                    kTextTopPaddingAdjustment - NSMinY(messageFrame);
+    rootFrame.size.height += delta;
+    titleFrame.origin.y += delta;
+    messageFrame.origin.y += delta;
   }
 
-  [rootView setFrame:rootFrame];
+  [[self view] setFrame:rootFrame];
+  [title_ setFrame:titleFrame];
+  [message_ setFrame:messageFrame];
+
+  return rootFrame;
 }
 
 - (void)close:(id)sender {
   messageCenter_->RemoveNotification(notification_->id(), /*by_user=*/true);
 }
 
 - (const message_center::Notification*)notification {
   return notification_;
 }
 
@@ skipping 17 matching lines @@
        message_center::kNotificationIconSize,
        message_center::kNotificationIconSize);
   scoped_nsobject<NSBox> imageBox([[NSBox alloc] initWithFrame:imageFrame]);
   [self configureCustomBox:imageBox];
   [imageBox setFillColor:gfx::SkColorToCalibratedNSColor(
       message_center::kLegacyIconBackgroundColor)];
   [imageBox setAutoresizingMask:NSViewMinYMargin];
 
   // Inside the image box put the actual icon view.
   icon_.reset([[NSImageView alloc] initWithFrame:imageFrame]);
-  [icon_ setImage:notification_->icon().AsNSImage()];
   [imageBox setContentView:icon_];
 
   return imageBox.autorelease();
 }
 
 - (void)configureCloseButtonInFrame:(NSRect)rootFrame {
   closeButton_.reset([[HoverImageButton alloc] initWithFrame:NSMakeRect(
       NSMaxX(rootFrame) - message_center::kControlButtonSize,
       NSMaxY(rootFrame) - message_center::kControlButtonSize,
       message_center::kControlButtonSize,
@@ skipping 11 matching lines @@
   [[closeButton_ cell] setHighlightsBy:NSOnState];
   [closeButton_ setTrackingEnabled:YES];
   [closeButton_ setBordered:NO];
   [closeButton_ setAutoresizingMask:NSViewMinYMargin];
   [closeButton_ setTarget:self];
   [closeButton_ setAction:@selector(close:)];
 }
 
 - (void)configureTitleInFrame:(NSRect)rootFrame {
   NSRect frame = [self currentContentRect];
-
-  title_.reset([self newLabelWithFrame:NSMakeRect(0, 0, NSWidth(frame), 0)]);
+  frame.size.height = 0;
+  title_.reset([self newLabelWithFrame:frame]);
   [title_ setAutoresizingMask:NSViewMinYMargin];
-  [title_ setStringValue:base::SysUTF16ToNSString(notification_->title())];
   [title_ setFont:[NSFont messageFontOfSize:message_center::kTitleFontSize]];
-
-  CGFloat delta =
-      [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:title_];
-  frame.size.height = delta;
-  frame.origin.y = NSMaxY(rootFrame) - message_center::kTextTopPadding +
-                   kTextTopPaddingAdjustment - delta;
-  [title_ setFrame:frame];
 }
 
-- (void)configureBodyInFrame:(NSRect)rootFrame maxY:(CGFloat)maxY {
+- (void)configureBodyInFrame:(NSRect)rootFrame {
   NSRect frame = [self currentContentRect];
-
-  message_.reset([self newLabelWithFrame:NSMakeRect(0, 0, NSWidth(frame), 0)]);
+  frame.size.height = 0;
+  message_.reset([self newLabelWithFrame:frame]);
   [message_ setAutoresizingMask:NSViewMinYMargin];
-  [message_ setStringValue:base::SysUTF16ToNSString(notification_->message())];
   [message_ setFont:
       [NSFont messageFontOfSize:message_center::kMessageFontSize]];
-
-  CGFloat delta =
-      [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:message_];
-  frame.size.height = delta;
-  frame.origin.y = maxY - message_center::kTextTopPadding +
-                   kTextTopPaddingAdjustment - delta;
-  [message_ setFrame:frame];
 }
 
 - (NSTextField*)newLabelWithFrame:(NSRect)frame {
   NSTextField* label = [[NSTextField alloc] initWithFrame:frame];
   [label setDrawsBackground:NO];
   [label setBezeled:NO];
   [label setEditable:NO];
   [label setSelectable:NO];
   [label setTextColor:gfx::SkColorToCalibratedNSColor(
       message_center::kRegularTextColor)];
   return label;
 }
 
 - (NSRect)currentContentRect {
   DCHECK(icon_);
   DCHECK(closeButton_);
 
   NSRect iconFrame, contentFrame;
   NSDivideRect([[self view] bounds], &iconFrame, &contentFrame,
       NSWidth([icon_ frame]) + message_center::kIconToTextPadding,
       NSMinXEdge);
   contentFrame.size.width -= NSWidth([closeButton_ frame]);
   return contentFrame;
 }
 
 @end