Changes the wrench menu to calculate the width needed for the zoom

chrome/browser/views/wrench_menu.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/views/wrench_menu.h"
 
 #include <cmath>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/host_zoom_map.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "gfx/canvas.h"
+#include "gfx/canvas_skia.h"
 #include "gfx/skia_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "views/background.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/menu_config.h"
@@ skipping 328 matching lines @@
 
     zoom_label_ = new Label(l10n_util::GetStringF(IDS_ZOOM_PERCENT, L"100"));
     zoom_label_->SetColor(MenuConfig::instance().text_color);
     zoom_label_->SetHorizontalAlignment(Label::ALIGN_RIGHT);
     MenuButtonBackground* center_bg =
         new MenuButtonBackground(MenuButtonBackground::CENTER_BUTTON);
     zoom_label_->set_background(center_bg);
     zoom_label_->set_border(new MenuButtonBorder());
     zoom_label_->SetFont(MenuConfig::instance().font);
     AddChildView(zoom_label_);
-    // Get the preferred width given 100%, we'll use this in calculating our
-    // preferred size.
-    zoom_label_width_ = zoom_label_->GetPreferredSize().width();
+    zoom_label_width_ = MaxWidthForZoomLabel();
 
     decrement_button_ = CreateAndConfigureButton(
         this, this, IDS_ZOOM_MINUS2, MenuButtonBackground::RIGHT_BUTTON,
         menu_model, decrement_index, NULL);
 
     center_bg->SetOtherButtons(increment_button_, decrement_button_);
 
     fullscreen_button_ = new FullscreenButton(this);
     fullscreen_button_->SetImage(
         ImageButton::BS_NORMAL,
@@ skipping 66 matching lines @@
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     DCHECK_EQ(NotificationType::ZOOM_LEVEL_CHANGED, type.value);
     UpdateZoomControls();
   }
 
  private:
   void UpdateZoomControls() {
     bool enable_increment, enable_decrement;
     int zoom_percent =
-        static_cast<int>(GetZoom(&enable_increment, &enable_decrement) * 100);
+        static_cast<int>(GetZoom(&enable_increment, &enable_decrement));
     zoom_label_->SetText(l10n_util::GetStringF(
                              IDS_ZOOM_PERCENT, IntToWString(zoom_percent)));
     increment_button_->SetEnabled(enable_increment);
     decrement_button_->SetEnabled(enable_decrement);
   }
 
   double GetZoom(bool* enable_increment, bool* enable_decrement) {
     // TODO: move this somewhere it can be shared.
     TabContents* selected_tab = menu_->browser_->GetSelectedTabContents();
     *enable_decrement = *enable_increment = false;
     if (!selected_tab)
       return 1;
 
     HostZoomMap* zoom_map = selected_tab->profile()->GetHostZoomMap();
     if (!zoom_map)
       return 1;
 
     int zoom_level = zoom_map->GetZoomLevel(selected_tab->GetURL());
-    double value = static_cast<double>(
-        std::max(std::min(std::pow(1.2, zoom_level), 3.0), .5));
-    *enable_decrement = (value != .5);
-    *enable_increment = (value != 3.0);
+    double value = ZoomPercentFromZoomLevel(zoom_level);
+    *enable_decrement = (value != 50);
+    *enable_increment = (value != 300);
     return value;
   }
 
+  double ZoomPercentFromZoomLevel(int level) {
+    return static_cast<double>(
+        std::max(std::min(std::pow(1.2, level), 3.0), .5)) * 100;
+  }
+
+  // Calculates the max width the zoom string can be.
+  int MaxWidthForZoomLabel() {
+    gfx::Font font = zoom_label_->font();
+    gfx::Insets insets;
+    if (zoom_label_->border())
+      zoom_label_->border()->GetInsets(&insets);
+    int max_w = 0;
+    for (int i = -4; i <= 7; ++i) {
+      int zoom_percent = static_cast<int>(ZoomPercentFromZoomLevel(i));
+      int w = font.GetStringWidth(
+          l10n_util::GetStringF(IDS_ZOOM_PERCENT, zoom_percent));
+      max_w = std::max(w, max_w);
+    }
+    return max_w + insets.width();
+  }
+
   // Hosting WrenchMenu.
   WrenchMenu* menu_;
 
   // The menu model containing the increment/decrement/reset items.
   MenuModel* menu_model_;
 
   // Index of the fullscreen menu item in the model.
   const int fullscreen_index_;
 
   NotificationRegistrar registrar_;
@@ skipping 178 matching lines @@
   }
 
   return menu_item;
 }
 
 void WrenchMenu::CancelAndEvaluate(MenuModel* model, int index) {
   selected_menu_model_ = model;
   selected_index_ = index;
   root_->Cancel();
 }