Fix focus rects for checkboxes and radio buttons:...

chrome/views/controls/button/checkbox.cc

 // Copyright (c) 2009 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 "chrome/views/controls/button/checkbox.h"
 
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/controls/label.h"
 
 namespace views {
@@ skipping 64 matching lines @@
   label_->SetBounds(
       label_x, 0, std::max(0, width() - label_x - kLabelFocusPaddingHorizontal),
       height());
   int first_line_height = label_->GetFont().height();
   native_wrapper_->GetView()->SetBounds(
       0, ((first_line_height - checkmark_prefsize.height()) / 2),
       checkmark_prefsize.width(), checkmark_prefsize.height());
   native_wrapper_->GetView()->Layout();
 }
 
-void Checkbox::Paint(ChromeCanvas* canvas) {
-  // Paint the focus border manually since we don't want to send actual focus
-  // in to the inner view.
-  if (HasFocus()) {
-    gfx::Rect label_bounds = label_->bounds();
-    canvas->DrawFocusRect(
-        MirroredLeftPointForRect(label_bounds) - kLabelFocusPaddingHorizontal,
-        0,
-        label_bounds.width() + kLabelFocusPaddingHorizontal * 2,
-        label_bounds.height() - kLabelFocusPaddingVertical * 2);
-  }
+void Checkbox::PaintFocusBorder(ChromeCanvas* canvas) {
+  // Our focus border is rendered by the label, so we don't do anything here.
 }
 
 View* Checkbox::GetViewForPoint(const gfx::Point& point) {
   return GetViewForPoint(point, false);
 }
 
 View* Checkbox::GetViewForPoint(const gfx::Point& point,
                                 bool can_create_floating) {
   return GetLocalBounds(true).Contains(point) ? this : NULL;
 }
@@ skipping 16 matching lines @@
 }
 
 void Checkbox::OnMouseReleased(const MouseEvent& e, bool canceled) {
   native_wrapper_->SetPushed(false);
   if (!canceled && HitTestLabel(e)) {
     SetChecked(!checked());
     ButtonPressed();
   }
 }
 
+bool Checkbox::OnMouseDragged(const MouseEvent& e) {
+  return false;
+}
+
+void Checkbox::WillGainFocus() {
+  label_->set_paint_as_focused(true);
+}
+
+void Checkbox::WillLoseFocus() {
+  label_->set_paint_as_focused(false);
+}
+
 std::string Checkbox::GetClassName() const {
   return kViewClassName;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Checkbox, NativeButton overrides:
 
 void Checkbox::CreateWrapper() {
   native_wrapper_ = NativeButtonWrapper::CreateCheckboxWrapper(this);
   native_wrapper_->UpdateLabel();
   native_wrapper_->UpdateChecked();
 }
 
 void Checkbox::InitBorder() {
   // No border, so we do nothing.
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// Checkbox, protected:
+
+bool Checkbox::HitTestLabel(const MouseEvent& e) {
+  gfx::Point tmp(e.location());
+  ConvertPointToView(this, label_, &tmp);
+  return label_->HitTest(tmp);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // Checkbox, private:
 
 void Checkbox::Init(const std::wstring& label_text) {
   set_minimum_size(gfx::Size(0, 0));
   label_ = new Label(label_text);
   label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
   AddChildView(label_);
 }
 
-bool Checkbox::HitTestLabel(const MouseEvent& e) {
-  gfx::Point tmp(e.location());
-  ConvertPointToView(this, label_, &tmp);
-  return label_->HitTest(tmp);
-}
-
 }  // namespace views