Implement rough new dialog style.

ui/views/window/dialog_frame_view.cc

Index: ui/views/window/dialog_frame_view.cc
diff --git a/ui/views/window/dialog_frame_view.cc b/ui/views/window/dialog_frame_view.cc
index 06706d7f13bd691a9603a60339a8d9f1b1d5a487..99807e993fba0bf39e8881696769b45011eb806d 100644
--- a/ui/views/window/dialog_frame_view.cc
+++ b/ui/views/window/dialog_frame_view.cc
@@ -12,66 +12,54 @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/insets.h"
 #include "ui/views/background.h"
-#include "ui/views/border.h"
-#include "ui/views/controls/button/image_button.h"
+#include "ui/views/bubble/bubble_border.h"
+#include "ui/views/controls/button/label_button.h"
+#include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
-#include "ui/views/widget/widget_delegate.h"
+#include "ui/views/window/dialog_delegate.h"
 
 namespace {
 
-// TODO(benrg): Make frame shadow and stroke agree with the spec.
-
-// TODO(benrg): Title bar text should be #222, not black. Text in the client
-// area should also be #222, but is currently usually black. Punting on this
-// until the overhaul of color handling that will be happening Real Soon Now.
-const SkColor kDialogTitleColor = SK_ColorBLACK;
-const SkColor kDialogBackgroundColor = SK_ColorWHITE;
-
-// Dialog-size-dependent padding values from the spec, in pixels.
-const int kGoogleSmallDialogVPadding = 16;
-const int kGoogleSmallDialogHPadding = 20;
-const int kGoogleMediumDialogVPadding = 28;
-const int kGoogleMediumDialogHPadding = 32;
-const int kGoogleLargeDialogVPadding = 30;
-const int kGoogleLargeDialogHPadding = 42;
-
-// Dialog layouts themselves contain some padding, which should be ignored in
-// favor of the padding values above. Currently we hack it by nudging the
-// client area outward.
-const int kDialogHPaddingNudge = 13;
-const int kDialogTopPaddingNudge = 5;
-const int kDialogBottomPaddingNudge = 10;
-
-// TODO(benrg): There are no examples in the spec of close boxes on medium- or
-// small-size dialogs, and the close button size is not factored into other
-// sizing decisions. This value could cause problems with smaller dialogs.
-const int kCloseButtonSize = 44;
+// The base spacing value, multiples of which are used in various places.
+const int kSpacing = 10;
+
+// static
+const char kViewClassName[] = "ui/views/DialogFrameView";
 
 }  // namespace
 
 namespace views {
 
-// static
-const char DialogFrameView::kViewClassName[] = "ui/views/DialogFrameView";
-
 ////////////////////////////////////////////////////////////////////////////////
 // DialogFrameView, public:
 
-DialogFrameView::DialogFrameView() {
-  set_background(Background::CreateSolidBackground(kDialogBackgroundColor));
+DialogFrameView::DialogFrameView(const string16& title) {
+  BubbleBorder* border =
+      new BubbleBorder(BubbleBorder::FLOAT, BubbleBorder::SMALL_SHADOW);
+  border->set_background_color(GetNativeTheme()->GetSystemColor(
+      ui::NativeTheme::kColorId_DialogBackground));
+  set_border(border);
+  // Update the background, which relies on the border.
+  set_background(new BubbleBackground(border));
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  title_font_.reset(new gfx::Font(rb.GetFont(ui::ResourceBundle::MediumFont)));
-  close_button_ = new views::ImageButton(this);
-  close_button_->SetImage(views::CustomButton::STATE_NORMAL,
-      rb.GetImageNamed(IDR_CLOSE_BAR).ToImageSkia());
-  close_button_->SetImage(CustomButton::STATE_HOVERED,
-      rb.GetImageNamed(IDR_CLOSE_BAR_H).ToImageSkia());
-  close_button_->SetImage(CustomButton::STATE_PRESSED,
-      rb.GetImageNamed(IDR_CLOSE_BAR_P).ToImageSkia());
-  close_button_->SetImageAlignment(ImageButton::ALIGN_CENTER,
-                                   ImageButton::ALIGN_MIDDLE);
-  AddChildView(close_button_);
+  title_ = new Label(title, rb.GetFont(ui::ResourceBundle::MediumFont));

[sky, 2013/01/07 16:51:03]

Can you member initialize these to NULL.

[msw, 2013/01/07 18:06:32]

Done.

+  title_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  AddChildView(title_);
+
+  close_ = new LabelButton(this, string16());
+  close_->SetImage(CustomButton::STATE_NORMAL,
+                   *rb.GetImageNamed(IDR_CLOSE_BAR).ToImageSkia());
+  close_->SetImage(CustomButton::STATE_HOVERED,
+                   *rb.GetImageNamed(IDR_CLOSE_BAR_H).ToImageSkia());
+  close_->SetImage(CustomButton::STATE_PRESSED,
+                   *rb.GetImageNamed(IDR_CLOSE_BAR_P).ToImageSkia());
+  close_->SetSize(close_->GetPreferredSize());
+  AddChildView(close_);
+
+  // Set the margins for the content view.
+  content_margins_ = gfx::Insets(2 * kSpacing + title_->font().GetHeight(),
+                                 2 * kSpacing, 2 * kSpacing, 2 * kSpacing);
 }
 
 DialogFrameView::~DialogFrameView() {
@@ -94,26 +82,22 @@ gfx::Rect DialogFrameView::GetWindowBoundsForClientBounds(
 }
 
 int DialogFrameView::NonClientHitTest(const gfx::Point& point) {
-  if (close_button_->GetMirroredBounds().Contains(point))
+  if (close_->GetMirroredBounds().Contains(point))
     return HTCLOSE;
   return point.y() < GetClientInsets().top() ? HTCAPTION : HTCLIENT;
 }
 
 void DialogFrameView::GetWindowMask(const gfx::Size& size,
                                     gfx::Path* window_mask) {
-  // Nothing to do.
 }
 
 void DialogFrameView::ResetWindowControls() {
-  // Nothing to do.
 }
 
 void DialogFrameView::UpdateWindowIcon() {
-  // Nothing to do.
 }
 
 void DialogFrameView::UpdateWindowTitle() {
-  // Nothing to do.
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -124,65 +108,28 @@ std::string DialogFrameView::GetClassName() const {
 }
 
 void DialogFrameView::Layout() {
-  title_display_rect_ = GetLocalBounds();
-  title_display_rect_.Inset(GetPaddingInsets());
-  title_display_rect_.set_height(title_font_->GetHeight());
-
-  // The hot rectangle for the close button is flush with the upper right of the
-  // dialog. The close button image is smaller, and is centered in the hot rect.
-  close_button_->SetBounds(
-      width() - kCloseButtonSize,
-      0, kCloseButtonSize, kCloseButtonSize);
-}
-
-void DialogFrameView::OnPaint(gfx::Canvas* canvas) {
-  View::OnPaint(canvas);
-  WidgetDelegate* delegate = GetWidget()->widget_delegate();
-  if (!delegate)
-    return;
-  canvas->DrawStringInt(delegate->GetWindowTitle(), *title_font_.get(),
-                        kDialogTitleColor, title_display_rect_);
+  gfx::Rect bounds = GetLocalBounds();
+  bounds.Inset(border()->GetInsets());
+  close_->SetPosition(gfx::Point(bounds.right() - close_->width(), bounds.y()));
+  bounds.Inset(gfx::Insets(kSpacing, 2 * kSpacing, 0, close_->width()));
+  bounds.set_height(title_->font().GetHeight());
+  title_->SetBoundsRect(bounds);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogFrameView, ButtonListener overrides:
 
 void DialogFrameView::ButtonPressed(Button* sender, const ui::Event& event) {
-  if (sender == close_button_)
+  if (sender == close_)
     GetWidget()->Close();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogFrameView, private:
 
-gfx::Insets DialogFrameView::GetPaddingInsets() const {
-  // These three discrete padding sizes come from the spec. If we ever wanted
-  // our Google-style dialogs to be resizable, we would probably need to
-  // smoothly interpolate the padding size instead.
-  int v_padding, h_padding;
-  if (width() <= 280) {
-    v_padding = kGoogleSmallDialogVPadding;
-    h_padding = kGoogleSmallDialogHPadding;
-  } else if (width() <= 480) {
-    v_padding = kGoogleMediumDialogVPadding;
-    h_padding = kGoogleMediumDialogHPadding;
-  } else {
-    v_padding = kGoogleLargeDialogVPadding;
-    h_padding = kGoogleLargeDialogHPadding;
-  }
-  return gfx::Insets(v_padding, h_padding, v_padding, h_padding);
-}
-
 gfx::Insets DialogFrameView::GetClientInsets() const {
-  gfx::Insets insets = GetPaddingInsets();
-  // The title should be separated from the client area by 1 em (dialog spec),
-  // and one em is equal to the font size (CSS spec).
-  insets += gfx::Insets(
-      title_font_->GetHeight() + title_font_->GetFontSize() -
-          kDialogTopPaddingNudge,
-      -kDialogHPaddingNudge,
-      -kDialogBottomPaddingNudge,
-      -kDialogHPaddingNudge);
+  gfx::Insets insets = border()->GetInsets();
+  insets += content_margins_;
   return insets;
 }