summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorvarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-01 19:59:07 +0000
committervarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-01 19:59:07 +0000
commit534e326a8d539cc1ead844dc3b6a50886cb15349 (patch)
tree5e4f6657497ba801f957733d1fbc13b5bba25dad /ui
parentb38853382eb611f0ed48bf60d39092bc37ff5383 (diff)
downloadchromium_src-534e326a8d539cc1ead844dc3b6a50886cb15349.zip
chromium_src-534e326a8d539cc1ead844dc3b6a50886cb15349.tar.gz
chromium_src-534e326a8d539cc1ead844dc3b6a50886cb15349.tar.bz2
views::Label should paint borders in the overridden OnPaint() method.
BUG=none TEST=none Review URL: http://codereview.chromium.org/8764005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/views/controls/label.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
index aadac0e2..38ebf8a 100644
--- a/ui/views/controls/label.cc
+++ b/ui/views/controls/label.cc
@@ -307,6 +307,10 @@ void Label::OnBoundsChanged(const gfx::Rect& previous_bounds) {
void Label::OnPaint(gfx::Canvas* canvas) {
OnPaintBackground(canvas);
+ // We skip painting the focus border because it is being handled seperately by
+ // some subclasses of Label. We do not want View's focus border painting to
+ // interfere with that.
+ OnPaintBorder(canvas);
string16 paint_text;
gfx::Rect text_bounds;