Added padding below text in notifications.

ui/message_center/views/notification_view.cc

 // Copyright (c) 2012 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.
 
 #include "ui/message_center/views/notification_view.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
@@ skipping 14 matching lines @@
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 
 namespace {
 
 // Dimensions.
 const int kIconColumnWidth = message_center::kNotificationIconSize;
 const int kLegacyIconSize = 40;
 const int kTextLeftPadding = kIconColumnWidth +
-    message_center::kIconToTextPadding;
-const int kTextBottomPadding = 6;
+                             message_center::kIconToTextPadding;
+const int kTextBottomPadding = 12;
 const int kTextRightPadding = 23;
 const int kItemTitleToMessagePadding = 3;
 const int kButtonHeight = 38;
 const int kButtonHorizontalPadding = 16;
 const int kButtonVecticalPadding = 0;
 const int kButtonIconTopPadding = 11;
 const int kButtonIconToTitlePadding = 16;
 const int kButtonTitleTopPadding = 0;
 
 const size_t kTitleCharacterLimit = 100;
 const size_t kMessageCharacterLimit = 200;
 
 // Notification colors. The text background colors below are used only to keep
 // view::Label from modifying the text color and will not actually be drawn.
 // See view::Label's SetEnabledColor() and SetBackgroundColor() for details.
 const SkColor kRegularTextBackgroundColor = SK_ColorWHITE;
 const SkColor kDimTextColor = SkColorSetRGB(136, 136, 136);
 const SkColor kDimTextBackgroundColor = SK_ColorBLACK;
 const SkColor kButtonSeparatorColor = SkColorSetRGB(234, 234, 234);
 const SkColor kHoveredButtonBackgroundColor = SkColorSetRGB(243, 243, 243);
 
-// Static.
+// static
 views::Background* MakeBackground(
     SkColor color = message_center::kNotificationBackgroundColor) {
   return views::Background::CreateSolidBackground(color);
 }
 
-// Static.
-views::Border* MakeBorder(int top,
-                          int bottom,
-                          int left = kTextLeftPadding,
-                          int right = kTextRightPadding,
-                          SkColor color = 0x00000000) {
-  return (color == 0x00000000) ?
-         views::Border::CreateEmptyBorder(top, left, bottom, right) :
-         views::Border::CreateSolidSidedBorder(top, left, bottom, right, color);
+// static
+views::Border* MakeEmptyBorder(int top, int left, int bottom, int right) {
+  return views::Border::CreateEmptyBorder(top, left, bottom, right);
+}
+
+// static
+views::Border* MakeTextBorder(int top, int bottom) {
+  return MakeEmptyBorder(top, kTextLeftPadding, bottom, kTextRightPadding);
+}
+
+// static
+views::Border* MakeSeparatorBorder(int top, int left, SkColor color) {
+  return views::Border::CreateSolidSidedBorder(top, left, 0, 0, color);
 }
 
 // ContainerView ///////////////////////////////////////////////////////////////
 
 // ContainerViews are vertical BoxLayout views that propagates their childrens'
 // ChildPreferredSizeChanged() and ChildVisibilityChanged() calls.
 class ContainerView : public views::View {
  public:
   ContainerView();
   virtual ~ContainerView();
@@ skipping 187 matching lines @@
     delete icon_;  // This removes the icon from this view's children.
   if (image.isNull()) {
     icon_ = NULL;
   } else {
     icon_ = new views::ImageView();
     icon_->SetImageSize(gfx::Size(message_center::kNotificationButtonIconSize,
                                   message_center::kNotificationButtonIconSize));
     icon_->SetImage(image);
     icon_->SetHorizontalAlignment(views::ImageView::LEADING);
     icon_->SetVerticalAlignment(views::ImageView::LEADING);
-    icon_->set_border(MakeBorder(kButtonIconTopPadding, 0, 0, 0));
+    icon_->set_border(MakeEmptyBorder(kButtonIconTopPadding, 0, 0, 0));
     AddChildViewAt(icon_, 0);
   }
 }
 
 void NotificationButton::SetTitle(const string16& title) {
   if (title_ != NULL)
     delete title_;  // This removes the title from this view's children.
   if (title.empty()) {
     title_ = NULL;
   } else {
     title_ = new views::Label(title);
     title_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     title_->SetElideBehavior(views::Label::ELIDE_AT_END);
     title_->SetEnabledColor(message_center::kRegularTextColor);
     title_->SetBackgroundColor(kRegularTextBackgroundColor);
-    title_->set_border(MakeBorder(kButtonTitleTopPadding, 0, 0, 0));
+    title_->set_border(MakeEmptyBorder(kButtonTitleTopPadding, 0, 0, 0));
     AddChildView(title_);
   }
 }
 
 gfx::Size NotificationButton::GetPreferredSize() {
   return gfx::Size(message_center::kNotificationWidth, kButtonHeight);
 }
 
 int NotificationButton::GetHeightForWidth(int width) {
   return kButtonHeight;
@@ skipping 49 matching lines @@
                                    bool expanded)
     : MessageView(notification, observer, expanded) {
   // Create the opaque background that's above the view's shadow.
   background_view_ = new views::View();
   background_view_->set_background(MakeBackground());
 
   // Create the top_view_, which collects into a vertical box all content
   // at the top of the notification (to the right of the icon) except for the
   // close button.
   top_view_ = new ContainerView();
+  top_view_->set_border(MakeEmptyBorder(kTextTopPadding - 8, 0,
+                                        kTextBottomPadding - 5, 0));
 
   // Create the title view if appropriate.
   title_view_ = NULL;
   if (!notification.title().empty()) {
     title_view_ = new views::Label(
         MaybeTruncateText( notification.title(), kTitleCharacterLimit));
     title_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     if (is_expanded())
       title_view_->SetMultiLine(true);
     else
       title_view_->SetElideBehavior(views::Label::ELIDE_AT_END);
     title_view_->SetFont(title_view_->font().DeriveFont(2));
     title_view_->SetEnabledColor(message_center::kRegularTextColor);
     title_view_->SetBackgroundColor(kRegularTextBackgroundColor);
-    title_view_->set_border(MakeBorder(kTextTopPadding, 3));
+    title_view_->set_border(MakeTextBorder(3, 0));
     top_view_->AddChildView(title_view_);
   }
 
   // Create the message view if appropriate.
   message_view_ = NULL;
   if (!notification.message().empty()) {
     message_view_ = new views::Label(
         MaybeTruncateText(notification.message(), kMessageCharacterLimit));
     message_view_->SetVisible(!is_expanded() || !notification.items().size());
     message_view_->set_collapse_when_hidden(true);
     message_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     if (is_expanded())
       message_view_->SetMultiLine(true);
     else
       message_view_->SetElideBehavior(views::Label::ELIDE_AT_END);
     message_view_->SetEnabledColor(message_center::kRegularTextColor);
     message_view_->SetBackgroundColor(kRegularTextBackgroundColor);
-    message_view_->set_border(MakeBorder(0, 3));
+    message_view_->set_border(MakeTextBorder(4, 1));
     top_view_->AddChildView(message_view_);
   }
 
   // Create the list item views (up to a maximum).
   std::vector<NotificationItem> items = notification.items();
   for (size_t i = 0; i < items.size() && i < kNotificationMaximumItems; ++i) {
     ItemView* item_view = new ItemView(items[i]);
     item_view->SetVisible(is_expanded());
-    item_view->set_border(MakeBorder(0, 4));
+    item_view->set_border(MakeTextBorder(i > 0 ? 0 : 4, 1));
     item_views_.push_back(item_view);
     top_view_->AddChildView(item_view);
   }
 
   // Create the notification icon view.
   if (notification.type() == NOTIFICATION_TYPE_SIMPLE) {
     views::ImageView* icon_view = new views::ImageView();
     icon_view->SetImage(notification.icon().AsImageSkia());
     icon_view->SetImageSize(gfx::Size(kLegacyIconSize, kLegacyIconSize));
     icon_view->SetHorizontalAlignment(views::ImageView::CENTER);
@@ skipping 13 matching lines @@
   if (!notification.image().IsEmpty()) {
     image_view_ = new ProportionalImageView(notification.image().AsImageSkia());
     image_view_->SetVisible(is_expanded());
     bottom_view_->AddChildView(image_view_);
   }
 
   // Create action buttons if appropriate.
   std::vector<ButtonInfo> buttons = notification.buttons();
   for (size_t i = 0; i < buttons.size(); ++i) {
     views::View* separator = new views::ImageView();
-    separator->set_border(MakeBorder(1, 0, 0, 0, kButtonSeparatorColor));
+    separator->set_border(MakeSeparatorBorder(1, 0, kButtonSeparatorColor));
     bottom_view_->AddChildView(separator);
     NotificationButton* button = new NotificationButton(this);
     ButtonInfo button_info = buttons[i];
     button->SetTitle(button_info.title);
     button->SetIcon(button_info.icon.AsImageSkia());
     action_buttons_.push_back(button);
     bottom_view_->AddChildView(button);
   }
 
   // Hide the expand button if appropriate.
@@ skipping 90 matching lines @@
                                              size_t limit) {
   // Currently just truncate the text by the total number of characters.
   // TODO(mukai): add better assumption like number of lines.
   if (!is_expanded())
     return text;
 
   return ui::TruncateString(text, limit);
 }
 
 }  // namespace message_center