Combobox: Rename styles to STYLE_NORMAL and STYLE_ACTION and modify behaviors

ui/views/controls/combobox/combobox.cc

 // Copyright (c) 2012 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 "ui/views/controls/combobox/combobox.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
@@ skipping 260 matching lines @@
   return rb.GetFontList(ui::ResourceBundle::BaseFont);
 }
 
 void Combobox::SetStyle(Style style) {
   if (style_ == style)
     return;
 
   style_ = style;
 
   UpdateBorder();
+  UpdateFromModel();
   PreferredSizeChanged();
 }
 
 void Combobox::ModelChanged() {
   selected_index_ = std::min(0, model_->GetItemCount());
   UpdateFromModel();
   PreferredSizeChanged();
 }
 
 void Combobox::SetSelectedIndex(int index) {
@@ skipping 60 matching lines @@
   return false;
 }
 
 bool Combobox::IsCommandEnabled(int id) const {
   return model()->IsItemEnabledAt(MenuCommandToIndex(id));
 }
 
 void Combobox::ExecuteCommand(int id) {
   selected_index_ = MenuCommandToIndex(id);
   OnSelectionChanged();
+  if (style_ == STYLE_NOTIFY_ON_CLICK)
+    HandleClickEvent();
 }
 
 bool Combobox::GetAccelerator(int id, ui::Accelerator* accel) {
   return false;
 }
 
 int Combobox::GetRowCount() {
   return model()->GetItemCount();
 }
 
@@ skipping 187 matching lines @@
     ui::MenuSourceType source_type = ui::MENU_SOURCE_MOUSE;
     if (event.IsKeyEvent())
       source_type = ui::MENU_SOURCE_KEYBOARD;
     else if (event.IsGestureEvent() || event.IsTouchEvent())
       source_type = ui::MENU_SOURCE_TOUCH;
     ShowDropDownMenu(source_type);
   }
 }
 
 void Combobox::UpdateFromModel() {
-  int max_width = 0;
   const gfx::FontList& font_list = Combobox::GetFontList();
 
   MenuItemView* menu = new MenuItemView(this);
   // MenuRunner owns |menu|.
   dropdown_list_menu_runner_.reset(new MenuRunner(menu));
 
   int num_items = model()->GetItemCount();
+  int width = 0;
   for (int i = 0; i < num_items; ++i) {
     if (model()->IsItemSeparatorAt(i)) {
       menu->AppendSeparator();
       continue;
     }
 
     base::string16 text = model()->GetItemAt(i);
 
     // Inserting the Unicode formatting characters if necessary so that the
     // text is displayed correctly in right-to-left UIs.
     base::i18n::AdjustStringForLocaleDirection(&text);
 
     menu->AppendMenuItem(i + kFirstMenuItemId, text, MenuItemView::NORMAL);
-    max_width = std::max(max_width, gfx::GetStringWidth(text, font_list));
+    if (style_ != STYLE_NOTIFY_ON_CLICK || i == 0)

[sky, 2014/01/22 16:04:07]

I don't understand this part of the change. Shouldn't the width always be the
max of all the content? Otherwise if the selected index changes the text is
going to be clipped.

[sky, 2014/01/23 01:11:23]

Sorry, one question here. If you do this and the selected index changes, then
isn't there a very high liklihood of the text being clipped? I'm wondering if
for this style ExecuteCommand shouldn't change the selected_index_? Or maybe
reset it after notifying listener?

[hajimehoshi, 2014/01/23 02:16:32]

For the current usage of Translate bubble, the bubble will be closed at the same
time the command is executed, so I didn't care about how the content should be
changed. So, I think ExecuteCommand shouldn't change the selected_index_.

+      width = std::max(width, gfx::GetStringWidth(text, font_list));
   }
 
-  content_size_.SetSize(max_width, font_list.GetHeight());
+  content_size_.SetSize(width, font_list.GetHeight());
 }
 
 void Combobox::UpdateBorder() {
   FocusableBorder* border = new FocusableBorder();
   if (style_ == STYLE_NOTIFY_ON_CLICK)
     border->SetInsets(8, 13, 8, 13);
   if (invalid_)
     border->SetColor(kWarningColor);
   set_border(border);
 }
@@ skipping 187 matching lines @@
 
 void Combobox::HandleClickEvent() {
   if (style_ != STYLE_NOTIFY_ON_CLICK)
     return;
 
   if (listener_)
     listener_->OnComboboxTextButtonClicked(this);
 }
 
 }  // namespace views