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

chrome/views/controls/label.cc

 // Copyright (c) 2006-2008 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/label.h"
 
 #include <math.h>
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/gfx/insets.h"
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/background.h"
 
 namespace views {
 
 const char Label::kViewClassName[] = "chrome/views/Label";
 
 static const SkColor kEnabledColor = SK_ColorBLACK;
 static const SkColor kDisabledColor = SkColorSetRGB(161, 161, 146);
+static const int kFocusBorderPadding = 1;
 
 Label::Label() {
   Init(L"", GetDefaultFont());
 }
 
 Label::Label(const std::wstring& text) {
   Init(text, GetDefaultFont());
 }
 
 Label::Label(const std::wstring& text, const ChromeFont& font) {
   Init(text, font);
 }
 
 void Label::Init(const std::wstring& text, const ChromeFont& font) {
   contains_mouse_ = false;
   font_ = font;
   text_size_valid_ = false;
   SetText(text);
   url_set_ = false;
   color_ = kEnabledColor;
   horiz_alignment_ = ALIGN_CENTER;
   is_multi_line_ = false;
   collapse_when_hidden_ = false;
   rtl_alignment_mode_ = USE_UI_ALIGNMENT;
+  paint_as_focused_ = false;
 }
 
 Label::~Label() {
 }
 
 gfx::Size Label::GetPreferredSize() {
   gfx::Size prefsize;
 
   // Return a size of (0, 0) if the label is not visible and if the
   // collapse_when_hidden_ flag is set.
@@ skipping 77 matching lines @@
   CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   canvas->DrawStringInt(paint_text,
                         font_,
                         color_,
                         text_bounds.x(),
                         text_bounds.y(),
                         text_bounds.width(),
                         text_bounds.height(),
                         flags);
 
-  if (is_multi_line_) {
-    PaintFocusBorder(canvas);
-  } else {
-    // We'll draw the focus border ourselves, so it is around the text.
-    if (HasFocus())
-      canvas->DrawFocusRect(text_bounds.x(),
-                            text_bounds.y(),
-                            text_bounds.width(),
-                            text_bounds.height());
+  // The focus border always hugs the text, regardless of the label's bounds.
+  if (HasFocus() || paint_as_focused_) {
+    int w = text_bounds.width();
+    int h = 0;
+    // We explicitly OR in MULTI_LINE here since SizeStringInt seems to return
+    // an incorrect height for single line text when the MULTI_LINE flag isn't
+    // specified. o_O...
+    ChromeCanvas::SizeStringInt(paint_text, font_, &w, &h,
+                                flags | ChromeCanvas::MULTI_LINE);
+    gfx::Rect focus_rect = text_bounds;
+    focus_rect.set_width(w);
+    focus_rect.set_height(h);
+    focus_rect.Inset(-kFocusBorderPadding, -kFocusBorderPadding);
+    canvas->DrawFocusRect(focus_rect.x(), focus_rect.y(), focus_rect.width(),
+                          focus_rect.height());
   }
 }
 
 void Label::PaintBackground(ChromeCanvas* canvas) {
   const Background* bg = contains_mouse_ ? GetMouseOverBackground() : NULL;
   if (!bg)
     bg = background();
   if (bg)
     bg->Paint(canvas, this);
 }
@@ skipping 153 matching lines @@
   return mouse_over_background_.get();
 }
 
 void Label::SetEnabled(bool enabled) {
   if (enabled == enabled_)
     return;
   View::SetEnabled(enabled);
   SetColor(enabled ? kEnabledColor : kDisabledColor);
 }
 
+gfx::Insets Label::GetInsets() const {
+  gfx::Insets insets = View::GetInsets();
+  if (IsFocusable() || paint_as_focused_)  {
+    insets += gfx::Insets(kFocusBorderPadding, kFocusBorderPadding,
+                          kFocusBorderPadding, kFocusBorderPadding);
+  }
+  return insets;
+}
+
 // static
 ChromeFont Label::GetDefaultFont() {
   return ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
 }
 
 void Label::UpdateContainsMouse(const MouseEvent& event) {
   SetContainsMouse(GetTextBounds().Contains(event.x(), event.y()));
 }
 
 void Label::SetContainsMouse(bool contains_mouse) {
@@ skipping 72 matching lines @@
 
 bool Label::GetAccessibleState(VARIANT* state) {
   DCHECK(state);
 
   state->lVal |= STATE_SYSTEM_READONLY;
   return true;
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace views