diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 02:45:21 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 02:45:21 +0000 |
| commit | 27488c22fe34d431fa34576032d8a0fc92b61572 (patch) | |
| tree | 1f3d7e4462dc50196ae294767f7be70a5f44fb9e /views/controls | |
| parent | 4b16ba30c174bcda4879df8f826f046c0120417e (diff) | |
| download | chromium_src-27488c22fe34d431fa34576032d8a0fc92b61572.zip chromium_src-27488c22fe34d431fa34576032d8a0fc92b61572.tar.gz chromium_src-27488c22fe34d431fa34576032d8a0fc92b61572.tar.bz2 | |
ui/gfx: Convert Canvas::DrawFocusRect() to use gfx::Rect.
BUG=100898
R=pkasting@chromium.org
Review URL: http://codereview.chromium.org/8359029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/button/checkbox.cc | 3 | ||||
| -rw-r--r-- | views/controls/button/text_button.cc | 2 | ||||
| -rw-r--r-- | views/controls/label.cc | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/views/controls/button/checkbox.cc b/views/controls/button/checkbox.cc index b60e802..da2b04c 100644 --- a/views/controls/button/checkbox.cc +++ b/views/controls/button/checkbox.cc @@ -66,8 +66,7 @@ void Checkbox::OnPaintFocusBorder(gfx::Canvas* canvas) { // Increate the bounding box by one on each side so that that focus border // does not draw on top of the letters. bounds.Inset(-1, -1, -1, -1); - canvas->DrawFocusRect(bounds.x(), bounds.y(), bounds.width(), - bounds.height()); + canvas->DrawFocusRect(bounds); } } diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc index 755196a..b9c7bcce 100644 --- a/views/controls/button/text_button.cc +++ b/views/controls/button/text_button.cc @@ -830,7 +830,7 @@ void NativeTextButton::OnPaintFocusBorder(gfx::Canvas* canvas) { if ((IsFocusable() || IsAccessibilityFocusableInRootView()) && HasFocus()) { gfx::Rect rect(GetLocalBounds()); rect.Inset(3, 3); - canvas->DrawFocusRect(rect.x(), rect.y(), rect.width(), rect.height()); + canvas->DrawFocusRect(rect); } #else TextButton::OnPaintFocusBorder(canvas); diff --git a/views/controls/label.cc b/views/controls/label.cc index 33fbcd4..16248d9 100644 --- a/views/controls/label.cc +++ b/views/controls/label.cc @@ -275,8 +275,7 @@ void Label::PaintText(gfx::Canvas* canvas, if (HasFocus() || paint_as_focused_) { gfx::Rect focus_bounds = text_bounds; focus_bounds.Inset(-kFocusBorderPadding, -kFocusBorderPadding); - canvas->DrawFocusRect(focus_bounds.x(), focus_bounds.y(), - focus_bounds.width(), focus_bounds.height()); + canvas->DrawFocusRect(focus_bounds); } } |