diff options
| author | Leon Scroggins <scroggo@google.com> | 2009-10-01 15:20:13 -0400 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2009-10-01 15:20:13 -0400 |
| commit | 2097884b9e1630c3855a8580f84a308163e085e7 (patch) | |
| tree | f84a9c0fa1d9674ce9c55d4dc0e243ae7708b1bf /WebCore/platform/android/RenderThemeAndroid.cpp | |
| parent | 8b101d480f638c14f332d4be73a74925bfed1d82 (diff) | |
| download | external_webkit-2097884b9e1630c3855a8580f84a308163e085e7.zip external_webkit-2097884b9e1630c3855a8580f84a308163e085e7.tar.gz external_webkit-2097884b9e1630c3855a8580f84a308163e085e7.tar.bz2 | |
Revert "Don't extend the arrow asset of the combo box over the text, so that the real background"
This reverts commit 02b5ebb30fc88967b843818cbc61987f9dc9685d.
Diffstat (limited to 'WebCore/platform/android/RenderThemeAndroid.cpp')
| -rw-r--r-- | WebCore/platform/android/RenderThemeAndroid.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/WebCore/platform/android/RenderThemeAndroid.cpp b/WebCore/platform/android/RenderThemeAndroid.cpp index 51f404e..0f419f5 100644 --- a/WebCore/platform/android/RenderThemeAndroid.cpp +++ b/WebCore/platform/android/RenderThemeAndroid.cpp @@ -235,7 +235,7 @@ bool RenderThemeAndroid::paintTextArea(RenderObject* obj, const RenderObject::Pa { if (obj->isMenuList()) return paintCombo(obj, info, rect); - return true; + return true; } void RenderThemeAndroid::adjustSearchFieldStyle(CSSStyleSelector*, RenderStyle* style, Element*) const @@ -245,7 +245,7 @@ void RenderThemeAndroid::adjustSearchFieldStyle(CSSStyleSelector*, RenderStyle* bool RenderThemeAndroid::paintSearchField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&) { - return true; + return true; } void RenderThemeAndroid::adjustListboxStyle(CSSStyleSelector*, RenderStyle* style, Element*) const @@ -259,6 +259,12 @@ static void adjustMenuListStyleCommon(RenderStyle* style, Element* e) { // Added to make room for our arrow. style->setPaddingRight(Length(RenderSkinCombo::extraWidth(), Fixed)); + // Code copied from RenderThemeMac.mm + // Makes sure that the text shows up on our treatment + bool isEnabled = true; + if (e) + isEnabled = e->isEnabledFormControl(); + style->setColor(isEnabled ? Color::black : Color::darkGray); } void RenderThemeAndroid::adjustMenuListStyle(CSSStyleSelector*, RenderStyle* style, Element* e) const |