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

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

Issue 2319193002: More Harmony combobox/textfield updates: (Closed)
Patch Set: textfields 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/focusable_border.cc ('k') | ui/views/examples/textfield_example.h » ('j') | 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 c75ba050ba3697388502baf0ac5658f156923c4e..14736697771bda755ab2e7e08f2ad70cc1fee919 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -357,7 +357,7 @@ SkColor Textfield::GetTextColor() const {
if (!use_default_text_color_)
return text_color_;
- return GetNativeTheme()->GetSystemColor(read_only() ?
+ return GetNativeTheme()->GetSystemColor(read_only() || !enabled() ?
ui::NativeTheme::kColorId_TextfieldReadOnlyColor :
ui::NativeTheme::kColorId_TextfieldDefaultColor);
}
@@ -377,7 +377,7 @@ SkColor Textfield::GetBackgroundColor() const {
if (!use_default_background_color_)
return background_color_;
- return GetNativeTheme()->GetSystemColor(read_only() ?
+ return GetNativeTheme()->GetSystemColor(read_only() || !enabled() ?
ui::NativeTheme::kColorId_TextfieldReadOnlyBackground :
ui::NativeTheme::kColorId_TextfieldDefaultBackground);
}
« no previous file with comments | « ui/views/controls/focusable_border.cc ('k') | ui/views/examples/textfield_example.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698