Status area improvements:...

chrome/browser/chromeos/status/clock_menu_button.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string_util.h"
@@ skipping 10 matching lines @@
 
 // Amount of slop to add into the timer to make sure we're into the next minute
 // when the timer goes off.
 const int kTimerSlopSeconds = 1;
 
 ClockMenuButton::ClockMenuButton(StatusAreaHost* host)
     : MenuButton(NULL, std::wstring(), this, false),
       host_(host) {
   set_border(NULL);
   SetFont(ResourceBundle::GetSharedInstance().GetFont(
-      ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD));
-  SetEnabledColor(SK_ColorWHITE);
+      ResourceBundle::BaseFont).DeriveFont(1, gfx::Font::BOLD));
+  SetEnabledColor(0xB3FFFFFF); // White with 70% Alpha
   SetShowHighlighted(false);
-  // Set initial text to make sure that the text button wide enough.
-  std::wstring zero = ASCIIToWide("00");
-  SetText(l10n_util::GetStringF(IDS_STATUSBAR_CLOCK_SHORT_TIME_AM, zero, zero));
-  SetText(l10n_util::GetStringF(IDS_STATUSBAR_CLOCK_SHORT_TIME_PM, zero, zero));
+  // Fill text with 0s to figure out max width of text size.
+  ClearMaxTextSize();
+  std::wstring zero = ASCIIToWide("0");
+  std::wstring zerozero = ASCIIToWide("00");
+  SetText(l10n_util::GetStringF(IDS_STATUSBAR_CLOCK_SHORT_TIME_AM,
+                                zero, zerozero));
+  SetText(l10n_util::GetStringF(IDS_STATUSBAR_CLOCK_SHORT_TIME_PM,
+                                zero, zerozero));
+  max_width_one_digit = GetPreferredSize().width();
+  ClearMaxTextSize();
+  SetText(l10n_util::GetStringF(IDS_STATUSBAR_CLOCK_SHORT_TIME_AM,
+                                zerozero, zerozero));
+  SetText(l10n_util::GetStringF(IDS_STATUSBAR_CLOCK_SHORT_TIME_PM,
+                                zerozero, zerozero));
+  max_width_two_digit = GetPreferredSize().width();
   set_alignment(TextButton::ALIGN_RIGHT);
   UpdateTextAndSetNextTimer();
   // Init member prefs so we can update the clock if prefs change.
   // This only works if we are within a browser and have a profile.
   if (host->GetProfile())
     timezone_.Init(prefs::kTimeZone, host->GetProfile()->GetPrefs(), this);
 }
 
 void ClockMenuButton::UpdateTextAndSetNextTimer() {
   UpdateText();
@@ skipping 36 matching lines @@
   std::wstring hour_str = IntToWString(hour);
   std::wstring min_str = IntToWString(minute);
   // Append a "0" before the minute if it's only a single digit.
   if (minute < 10)
     min_str = IntToWString(0) + min_str;
   int msg = (ampm == UCAL_AM) ? IDS_STATUSBAR_CLOCK_SHORT_TIME_AM :
                                 IDS_STATUSBAR_CLOCK_SHORT_TIME_PM;
 
   std::wstring time_string = l10n_util::GetStringF(msg, hour_str, min_str);
 
+  // See if the preferred size changed. If so, relayout the StatusAreaView.
+  int cur_width = GetPreferredSize().width();
+  int new_width = hour < 10 ? max_width_one_digit : max_width_two_digit;
   SetText(time_string);
+  set_max_width(new_width);
+
+  // If width has changed, we want to relayout the StatusAreaView.
+  if (new_width != cur_width)
+    PreferredSizeChanged();
+
   SchedulePaint();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ClockMenuButton, menus::MenuModel implementation:
 
 int ClockMenuButton::GetItemCount() const {
   // If options dialog is unavailable, don't count a separator and configure
   // menu item.
   return host_->ShouldOpenButtonOptions(this) ? 3 : 1;
@@ skipping 42 matching lines @@
 void ClockMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
   if (!clock_menu_.get())
     clock_menu_.reset(new views::Menu2(this));
   else
     clock_menu_->Rebuild();
   clock_menu_->UpdateStates();
   clock_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
 
 }  // namespace chromeos