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

Unified Diff: ui/views/controls/textfield/textfield.cc

Issue 2313123002: Harmony - set correct textfield placeholder text color (Closed)
Patch Set: Created 4 years, 3 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 | « ui/views/controls/textfield/textfield.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/textfield/textfield.cc
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index d26febc0609540ae3f4d713ace1d7432b3441ff1..c75ba050ba3697388502baf0ac5658f156923c4e 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -1829,7 +1829,10 @@ void Textfield::PaintTextAndCursor(gfx::Canvas* canvas) {
gfx::RenderText* render_text = GetRenderText();
if (text().empty() && !GetPlaceholderText().empty()) {
canvas->DrawStringRect(GetPlaceholderText(), GetFontList(),
- placeholder_text_color(), render_text->display_rect());
+ ui::MaterialDesignController::IsSecondaryUiMaterial()
+ ? SkColorSetA(GetTextColor(), 0x83)
+ : placeholder_text_color_,
+ render_text->display_rect());
}
// Draw the text, cursor, and selection.
« no previous file with comments | « ui/views/controls/textfield/textfield.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698