Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Unified Diff: ui/views/controls/button/label_button.cc

Issue 120823003: [Views] Only paint background of text portion of LabelButton in inverted color theme. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/views/controls/button/label_button_border.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/label_button.cc
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
index 888a97c53fe1258e7a073d6f38ad2182d3fb7267..e858230c32cd2d824f47de5a420e2dbc8b315d8c 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -8,6 +8,7 @@
#include "grit/ui_resources.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/animation/throb_animation.h"
+#include "ui/gfx/canvas.h"
#include "ui/gfx/font_list.h"
#include "ui/gfx/sys_color_change_listener.h"
#include "ui/native_theme/native_theme.h"
@@ -275,6 +276,12 @@ const char* LabelButton::GetClassName() const {
void LabelButton::OnPaint(gfx::Canvas* canvas) {
View::OnPaint(canvas);
+
+ if (gfx::IsInvertedColorScheme()) {
+ gfx::Rect rect(label()->bounds());
+ canvas->FillRect(rect, label()->background_color());
msw 2014/01/03 00:16:39 nit: s/label()/label_/; inline label_->bounds(); d
Greg Billock 2014/01/06 17:29:20 Done.
+ }
+
Painter::PaintFocusPainter(this, canvas, focus_painter_.get());
}
« no previous file with comments | « no previous file | ui/views/controls/button/label_button_border.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698