diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-25 15:46:11 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-25 15:46:11 +0000 |
| commit | 520463bb07afafa722cceceea1247f2e833b2e75 (patch) | |
| tree | 1abce5e26b3c7ef77381716f291bdf7dad0f8c6e /ash/system | |
| parent | f8720ff20cf28e0ddacff4b6855056a78e06fe4a (diff) | |
| download | chromium_src-520463bb07afafa722cceceea1247f2e833b2e75.zip chromium_src-520463bb07afafa722cceceea1247f2e833b2e75.tar.gz chromium_src-520463bb07afafa722cceceea1247f2e833b2e75.tar.bz2 | |
ash: In vertical clock, right-align single-digit hours
Based on UX feedback we want to display times like 1:45 PM as:
1
45
regardless of shelf aligned left or right.
BUG=297042
TEST=visual
R=harrym@chromium.org
Review URL: https://codereview.chromium.org/24281010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225190 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/date/date_view.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ash/system/date/date_view.cc b/ash/system/date/date_view.cc index 53eb162..2ede5db 100644 --- a/ash/system/date/date_view.cc +++ b/ash/system/date/date_view.cc @@ -8,6 +8,7 @@ #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_utils.h" +#include "base/i18n/rtl.h" #include "base/i18n/time_formatting.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" @@ -215,6 +216,13 @@ void TimeView::UpdateTextInternal(const base::Time& now) { size_t colon_pos = current_time.find(ASCIIToUTF16(":")); base::string16 hour = current_time.substr(0, colon_pos); base::string16 minute = current_time.substr(colon_pos + 1); + + // Sometimes pad single-digit hours with a zero for aesthetic reasons. + if (hour.length() == 1 && + hour_type_ == base::k24HourClock && + !base::i18n::IsRTL()) + hour = ASCIIToUTF16("0") + hour; + vertical_label_hours_->SetText(hour); vertical_label_minutes_->SetText(minute); Layout(); @@ -244,7 +252,7 @@ void TimeView::UpdateClockLayout(TrayDate::ClockLayout clock_layout){ const int kColumnId = 0; views::ColumnSet* columns = layout->AddColumnSet(kColumnId); columns->AddPaddingColumn(0, kVerticalClockLeftPadding); - columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER, + columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0); layout->AddPaddingRow(0, kTrayLabelItemVerticalPaddingVerticalAlignment); layout->StartRow(0, kColumnId); |