diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-13 18:20:44 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-13 18:20:44 +0000 |
| commit | ce20f0d83fefaed30d2a75d727c9a7a348948b52 (patch) | |
| tree | fa235abb1771f227185f87122f2f44ea2d8ed69b /ash | |
| parent | 85c2a3d46dd8cbdee6eb85ca99af062c31ac0cc0 (diff) | |
| download | chromium_src-ce20f0d83fefaed30d2a75d727c9a7a348948b52.zip chromium_src-ce20f0d83fefaed30d2a75d727c9a7a348948b52.tar.gz chromium_src-ce20f0d83fefaed30d2a75d727c9a7a348948b52.tar.bz2 | |
Adjust battery image assets to better align in ash tray:
Move the battery icon 1 pixel lower.
Center the battery icon and remove the special code adjustment for clipping non-centered battery icon.
Use new battery icons that aligns with battery percentage better.
BUG=172701
TBR=sky
Review URL: https://codereview.chromium.org/12259007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/resources/default_100_percent/cros/status/status_power_small_all.png | bin | 3123 -> 4844 bytes | |||
| -rw-r--r-- | ash/resources/default_100_percent/cros/status/status_power_small_all_dark.png | bin | 3660 -> 5002 bytes | |||
| -rw-r--r-- | ash/resources/default_200_percent/cros/status/status_power_small_all.png | bin | 6324 -> 8994 bytes | |||
| -rw-r--r-- | ash/resources/default_200_percent/cros/status/status_power_small_all_dark.png | bin | 7541 -> 9324 bytes | |||
| -rw-r--r-- | ash/system/power/tray_power.cc | 6 |
5 files changed, 2 insertions, 4 deletions
diff --git a/ash/resources/default_100_percent/cros/status/status_power_small_all.png b/ash/resources/default_100_percent/cros/status/status_power_small_all.png Binary files differindex dee1582..029e58c4 100644 --- a/ash/resources/default_100_percent/cros/status/status_power_small_all.png +++ b/ash/resources/default_100_percent/cros/status/status_power_small_all.png diff --git a/ash/resources/default_100_percent/cros/status/status_power_small_all_dark.png b/ash/resources/default_100_percent/cros/status/status_power_small_all_dark.png Binary files differindex 1e7e451..712c275 100644 --- a/ash/resources/default_100_percent/cros/status/status_power_small_all_dark.png +++ b/ash/resources/default_100_percent/cros/status/status_power_small_all_dark.png diff --git a/ash/resources/default_200_percent/cros/status/status_power_small_all.png b/ash/resources/default_200_percent/cros/status/status_power_small_all.png Binary files differindex 1fffce9..686343b 100644 --- a/ash/resources/default_200_percent/cros/status/status_power_small_all.png +++ b/ash/resources/default_200_percent/cros/status/status_power_small_all.png diff --git a/ash/resources/default_200_percent/cros/status/status_power_small_all_dark.png b/ash/resources/default_200_percent/cros/status/status_power_small_all_dark.png Binary files differindex 5a7998e..a2ebf55 100644 --- a/ash/resources/default_200_percent/cros/status/status_power_small_all_dark.png +++ b/ash/resources/default_200_percent/cros/status/status_power_small_all_dark.png diff --git a/ash/system/power/tray_power.cc b/ash/system/power/tray_power.cc index 6a7d114..d84e760 100644 --- a/ash/system/power/tray_power.cc +++ b/ash/system/power/tray_power.cc @@ -167,12 +167,10 @@ gfx::ImageSkia TrayPower::GetBatteryImage(int image_index, IconSet icon_set) { icon_set == ICON_DARK ? IDR_AURA_UBER_TRAY_POWER_SMALL_DARK : IDR_AURA_UBER_TRAY_POWER_SMALL); - // TODO(mbolohan): Remove the 2px offset when the assets are centered. See - // crbug.com/119832. gfx::Rect region( - ((image_index & 0x1) ? kBatteryImageWidth : 0) + 2, + (image_index & 0x1) ? kBatteryImageWidth : 0, (image_index >> 1) * kBatteryImageHeight, - kBatteryImageWidth - 2, kBatteryImageHeight); + kBatteryImageWidth, kBatteryImageHeight); return gfx::ImageSkiaOperations::ExtractSubset(*all.ToImageSkia(), region); } |
