Status area improvements:...

chrome/browser/chromeos/status/status_area_view.cc

 // Copyright (c) 2010 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/status_area_view.h"
 
 #include <algorithm>
 
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
 #include "chrome/browser/chromeos/status/language_menu_button.h"
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 #include "chrome/browser/chromeos/status/power_menu_button.h"
 #include "chrome/browser/chromeos/status/status_area_host.h"
 #include "gfx/canvas.h"
 
 namespace chromeos {
 
-// Number of pixels to pad on the left border.
-const int kLeftBorder = 1;
-// Number of pixels to separate the clock from the next item on the right.
-const int kClockSeparation = 4;
-// Number of pixels to separate the language selector from the next item
-// on the right.
-const int kLanguageSeparation = 4;
+// Number of pixels to separate each icon.
+const int kSeparation = 6;
 
 // BrowserWindowGtk tiles its image with this offset
 const int kCustomFrameBackgroundVerticalOffset = 15;
 
 // Default to opening new tabs on the left.
 StatusAreaView::OpenTabsMode StatusAreaView::open_tabs_mode_ =
     StatusAreaView::OPEN_TABS_ON_LEFT;
 
 StatusAreaView::StatusAreaView(StatusAreaHost* host)
     : host_(host),
@@ skipping 22 matching lines @@
 }
 
 void StatusAreaView::Update() {
   for (int i = 0; i < GetChildViewCount(); ++i) {
     views::View* cur = GetChildViewAt(i);
     cur->SetVisible(host_->IsButtonVisible(cur));
   }
 }
 
 gfx::Size StatusAreaView::GetPreferredSize() {
-  // Start with padding.
-  int result_w = kLeftBorder + kClockSeparation + kLanguageSeparation;
+  int result_w = kSeparation;
   int result_h = 0;
   for (int i = 0; i < GetChildViewCount(); i++) {
     views::View* cur = GetChildViewAt(i);
     if (cur->IsVisible()) {
       gfx::Size cur_size = cur->GetPreferredSize();
       // Add each width.
-      result_w += cur_size.width();
+      result_w += cur_size.width() + kSeparation;
       // Use max height.
       result_h = std::max(result_h, cur_size.height());
     }
   }
   return gfx::Size(result_w, result_h);
 }
 
 void StatusAreaView::Layout() {
-  int cur_x = kLeftBorder;
+  int cur_x = kSeparation;
   for (int i = 0; i < GetChildViewCount(); i++) {
     views::View* cur = GetChildViewAt(i);
     if (cur->IsVisible()) {
       gfx::Size cur_size = cur->GetPreferredSize();
       int cur_y = (height() - cur_size.height()) / 2;
 
       // Handle odd number of pixels.
       cur_y += (height() - cur_size.height()) % 2;
 
       // Put next in row horizontally, and center vertically.
       cur->SetBounds(cur_x, cur_y, cur_size.width(), cur_size.height());
 
-      cur_x += cur_size.width();
-
-      // Buttons have built in padding, but clock and language status don't.
-      if (cur == clock_view_)
-        cur_x += kClockSeparation;
-      else if (cur == language_view_)
-        cur_x += kLanguageSeparation;
+      cur_x += cur_size.width() + kSeparation;
     }
   }
 }
 
+void StatusAreaView::ChildPreferredSizeChanged(View* child) {
+  // When something like the clock menu button's size changes, we need to
+  // relayout. Also mark that this view's size has changed. This will let
+  // BrowserView know to relayout, which will reset the bounds of this view.
+  Layout();
+  PreferredSizeChanged();
+}
+
 // static
 StatusAreaView::OpenTabsMode StatusAreaView::GetOpenTabsMode() {
   return open_tabs_mode_;
 }
 
 // static
 void StatusAreaView::SetOpenTabsMode(OpenTabsMode mode) {
   open_tabs_mode_ = mode;
 }
 
 }  // namespace chromeos