Correct padding and focus ring for frameless constrained window dialog

ui/views/controls/button/chrome_style.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/views/controls/button/chrome_style.h"
 
 #include <algorithm>
 
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 #include "ui/gfx/canvas.h"
@@ skipping 44 matching lines @@
 const SkColor kTextShadowColor = SkColorSetRGB(0xf0, 0xf0, 0xf0);
 const int kTextShadowOffsetX = 0;
 const int kTextShadowOffsetY = 1;
 
 const int kBorderWidth = 1;
 const int kBorderRadius = 2;
 const SkColor kBorderNormalColor = SkColorSetARGB(0x3f, 0x0, 0x0, 0x0);
 const SkColor kBorderActiveColor = SkColorSetARGB(0x4b, 0x0, 0x0, 0x0);
 const SkColor kBorderDisabledColor = SkColorSetARGB(0x1d, 0x0, 0x0, 0x0);
 
-const int kFocusRingWidth = 2;
+const int kFocusRingWidth = 1;
 const int kFocusRingRadius = 2;
-const SkColor kFocusRingColor = SkColorSetARGB(0x7f, 0xe5, 0x97, 0x00);
+const SkColor kFocusRingColor = SkColorSetRGB(0x4d, 0x90, 0xfe);
 
 // Returns the uniform inset of the button from its local bounds.
 int GetButtonInset() {
   return std::max(kBorderWidth, kFocusRingWidth);
 }
 
 class ChromeStyleTextButtonBackgroundPainter : public Painter {
  public:
   ChromeStyleTextButtonBackgroundPainter()
       : gradient_painter_(NULL),
@@ skipping 177 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ChromeStyleTextButtonBorder);
 };
 
 class ChromeStyleFocusBorder : public views::FocusBorder {
  public:
   ChromeStyleFocusBorder() {}
 
   // Overriden from Border
   virtual void Paint(const View& view, gfx::Canvas* canvas) const {
-    gfx::Rect rect(view.GetLocalBounds());
-    SkScalar inset = SkFloatToScalar(GetButtonInset() - kFocusRingWidth / 2.0f);
-    rect.Inset(inset, inset);
     SkPaint paint;
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setStrokeWidth(SkIntToScalar(kFocusRingWidth));
     paint.setColor(kFocusRingColor);
-    canvas->DrawRoundRect(rect, SkIntToScalar(kFocusRingRadius), paint);
+
+    SkScalar inset = SkFloatToScalar(GetButtonInset() - kFocusRingWidth / 2.0f);
+    gfx::Rect view_bounds(view.GetLocalBounds());
+    SkRect rect = SkRect::MakeLTRB(
+        SkIntToScalar(view_bounds.x()) + inset,
+        SkIntToScalar(view_bounds.y()) + inset,
+        SkIntToScalar(view_bounds.width()) - inset,
+        SkIntToScalar(view_bounds.height()) - inset);
+    canvas->sk_canvas()->drawRoundRect(
+        rect, kFocusRingRadius, kFocusRingRadius, paint);

[Mike Wittman, 2012/10/09 22:55:46]

kFocusRingRadius should be converted to SkScalar before passing to
drawRoundRect.

[please use gerrit instead, 2012/10/10 19:12:58]

Done.

   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeStyleFocusBorder);
 };
 
 class ChromeStyleStateChangedUpdater
     : public CustomButtonStateChangedDelegate {
  public:
   // The background and border may be NULL.
@@ skipping 152 matching lines @@
 
   button->set_focus_border(new ChromeStyleFocusBorder);
 
   ChromeStyleStateChangedUpdater* state_changed_updater =
       new ChromeStyleStateChangedUpdater(button, background, border);
 
   button->set_state_changed_delegate(state_changed_updater);
 }
 
 }  // namespace views