| Index: ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
|
| diff --git a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
|
| index b10258c4566138eff71a32bba9c167faa3734b4c..94101dd0364278ed3b35285cae6fcf184814a52d 100644
|
| --- a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
|
| +++ b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
|
| @@ -346,22 +346,21 @@ void ImeMenuTray::ShowImeMenuBubble() {
|
| bubble_view->set_margins(gfx::Insets(7, 0, 0, 0));
|
| }
|
|
|
| + const gfx::Range height_range = GetImeListViewRange();
|
| +
|
| // Adds IME list to the bubble.
|
| ime_list_view_ = new ImeListView(nullptr, ShouldShowKeyboardToggle(),
|
| - ImeListView::SHOW_SINGLE_IME);
|
| + ImeListView::SHOW_SINGLE_IME, height_range);
|
|
|
| uint32_t current_height = ime_list_view_->scroll_content()->height();
|
| - const gfx::Range height_range = GetImeListViewRange();
|
| -
|
| - if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
|
| - ime_list_view_->scroller()->ClipHeightTo(height_range.start(),
|
| - height_range.end());
|
| - } else if (current_height > height_range.end()) {
|
| - ime_list_view_->scroller()->SetFixedSize(
|
| - gfx::Size(minimum_menu_width, height_range.end()));
|
| - } else if (current_height < height_range.start()) {
|
| - ime_list_view_->scroller()->SetFixedSize(
|
| - gfx::Size(minimum_menu_width, height_range.start()));
|
| + if (!MaterialDesignController::IsSystemTrayMenuMaterial()) {
|
| + if (current_height > height_range.end()) {
|
| + ime_list_view_->scroller()->SetFixedSize(
|
| + gfx::Size(minimum_menu_width, height_range.end()));
|
| + } else if (current_height < height_range.start()) {
|
| + ime_list_view_->scroller()->SetFixedSize(
|
| + gfx::Size(minimum_menu_width, height_range.start()));
|
| + }
|
| }
|
| bubble_view->AddChildView(ime_list_view_);
|
|
|
|
|