diff options
Diffstat (limited to 'WebKit/android/RenderSkinMediaButton.cpp')
-rw-r--r-- | WebKit/android/RenderSkinMediaButton.cpp | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/WebKit/android/RenderSkinMediaButton.cpp b/WebKit/android/RenderSkinMediaButton.cpp index 745fa88..240bbd6 100644 --- a/WebKit/android/RenderSkinMediaButton.cpp +++ b/WebKit/android/RenderSkinMediaButton.cpp @@ -58,8 +58,8 @@ static const PatchData gFiles[] = { "spinner_76_inner_holo.png", 0, 0 }, // SPINNER_INNER { "ic_media_video_poster.png", 0, 0 }, // VIDEO { "btn_media_player_disabled.9.png", 0, 0 }, // BACKGROUND_SLIDER - { "scrubber_track_holo_dark.9.png", 0, 0 }, // SLIDER_TRACK - { "scrubber_control_holo.png", 0, 0 } // SLIDER_THUMB + { "btn_media_player_pressed.9.png", 0, 0 }, // SLIDER_TRACK + { "btn_media_player.9.png", 0, 0 } // SLIDER_THUMB }; static SkBitmap gButton[sizeof(gFiles)/sizeof(gFiles[0])]; @@ -96,9 +96,9 @@ void RenderSkinMediaButton::Draw(SkCanvas* canvas, const IntRect& r, int buttonT return; } - bool drawsNinePatch = false; + bool drawsNinePatch = true; bool drawsImage = true; - bool drawsBackgroundColor = true; + bool drawsBackgroundColor = false; int ninePatchIndex = 0; int imageIndex = 0; @@ -112,6 +112,7 @@ void RenderSkinMediaButton::Draw(SkCanvas* canvas, const IntRect& r, int buttonT alpha = 190; SkColor backgroundColor = SkColorSetARGB(alpha, 34, 34, 34); + SkColor trackBackgroundColor = SkColorSetARGB(255, 100, 100, 100); paint.setColor(backgroundColor); paint.setFlags(SkPaint::kFilterBitmap_Flag); @@ -124,6 +125,7 @@ void RenderSkinMediaButton::Draw(SkCanvas* canvas, const IntRect& r, int buttonT case FULLSCREEN: { imageIndex = buttonType + 1; + drawsBackgroundColor = true; paint.setColor(backgroundColor); break; } @@ -139,24 +141,30 @@ void RenderSkinMediaButton::Draw(SkCanvas* canvas, const IntRect& r, int buttonT { drawsBackgroundColor = false; drawsImage = false; + drawsNinePatch = false; + drawsBackgroundColor = true; + paint.setColor(backgroundColor); break; } case SLIDER_TRACK: { - drawsNinePatch = true; drawsImage = false; - ninePatchIndex = buttonType + 1; + drawsNinePatch = false; + drawsBackgroundColor = true; + paint.setColor(trackBackgroundColor); + bounds.fTop += 8; + bounds.fBottom -= 8; break; } case SLIDER_THUMB: { - drawsBackgroundColor = false; - imageMargin = 0; - imageIndex = buttonType + 1; + drawsImage = false; + ninePatchIndex = buttonType + 1; break; } default: - return; + drawsImage = false; + drawsNinePatch = false; } if (drawsBackgroundColor) { |