diff options
| author | rjkroege@google.com <rjkroege@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-28 18:24:22 +0000 |
|---|---|---|
| committer | rjkroege@google.com <rjkroege@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-28 18:24:22 +0000 |
| commit | 59bafea4d9c8d5b82f36a75254585a519833c9a2 (patch) | |
| tree | 6f870e9a843b0830d64fafb2cff63d2ba359bd89 /chrome/browser/ui/touch | |
| parent | 0167fe342f32ba5586805c00bcbeaf8e50d86ee3 (diff) | |
| download | chromium_src-59bafea4d9c8d5b82f36a75254585a519833c9a2.zip chromium_src-59bafea4d9c8d5b82f36a75254585a519833c9a2.tar.gz chromium_src-59bafea4d9c8d5b82f36a75254585a519833c9a2.tar.bz2 | |
TouchTabStrip throbber rendered at wrong size.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6306017
Patch from Chad Faragher <wyck@chromium.org>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/touch')
| -rw-r--r-- | chrome/browser/ui/touch/tabs/touch_tab.cc | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/chrome/browser/ui/touch/tabs/touch_tab.cc b/chrome/browser/ui/touch/tabs/touch_tab.cc index 4d8c5df..e9aeecb 100644 --- a/chrome/browser/ui/touch/tabs/touch_tab.cc +++ b/chrome/browser/ui/touch/tabs/touch_tab.cc @@ -16,6 +16,7 @@ static const int kLeftPadding = 16; static const int kRightPadding = 15; static const int kDropShadowHeight = 2; +static const int kTouchFaviconSize = 32; TouchTab::TouchTabImage TouchTab::tab_alpha = {0}; TouchTab::TouchTabImage TouchTab::tab_active = {0}; @@ -176,10 +177,8 @@ void TouchTab::PaintIcon(gfx::Canvas* canvas) { IDR_THROBBER_WAITING : IDR_THROBBER)); int image_size = frames.height(); int image_offset = loading_animation_frame() * image_size; - int dst_y = (height() - image_size) / 2; - canvas->DrawBitmapInt(frames, image_offset, 0, image_size, - image_size, favicon_x, dst_y, image_size, image_size, - false); + canvas->DrawBitmapInt(frames, image_offset, 0, image_size, image_size, x, y, + kTouchFaviconSize, kTouchFaviconSize, false); } else { canvas->Save(); canvas->ClipRectInt(0, 0, width(), height()); @@ -187,17 +186,14 @@ void TouchTab::PaintIcon(gfx::Canvas* canvas) { ResourceBundle& rb = ResourceBundle::GetSharedInstance(); SkBitmap crashed_fav_icon(*rb.GetBitmapNamed(IDR_SAD_FAVICON)); canvas->DrawBitmapInt(crashed_fav_icon, 0, 0, crashed_fav_icon.width(), - crashed_fav_icon.height(), favicon_x, - (height() - crashed_fav_icon.height()) / 2 + fav_icon_hiding_offset(), - kFavIconSize, kFavIconSize, true); + crashed_fav_icon.height(), x, y + fav_icon_hiding_offset(), + kTouchFaviconSize, kTouchFaviconSize, true); } else { if (!data().favicon.isNull()) { - int size = 32; canvas->DrawBitmapInt(data().favicon, 0, 0, - data().favicon.width(), - data().favicon.height(), - x, y + fav_icon_hiding_offset(), size, size, - true); + data().favicon.width(), data().favicon.height(), + x, y + fav_icon_hiding_offset(), + kTouchFaviconSize, kTouchFaviconSize, true); } } canvas->Restore(); |