| Index: views/controls/menu/menu_item_view_gtk.cc
|
| diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc
|
| index 3f0a830db541f336f4f1bee3836ad5272a05930d..74255d1f4c1bdeeb0cd6f588d545bcef7c289539 100644
|
| --- a/views/controls/menu/menu_item_view_gtk.cc
|
| +++ b/views/controls/menu/menu_item_view_gtk.cc
|
| @@ -72,9 +72,10 @@ void MenuItemView::Paint(gfx::Canvas* canvas, bool for_drag) {
|
| SkColor fg_color =
|
| IsEnabled() ? TextButton::kEnabledColor : TextButton::kDisabledColor;
|
| #endif
|
| - int width = this->width() - item_right_margin_ - label_start_;
|
| const gfx::Font& font = GetChildViewCount() > 0 ?
|
| MenuConfig::instance().font_with_controls : MenuConfig::instance().font;
|
| + int accel_width = parent_menu_item_->GetSubmenu()->max_accelerator_width();
|
| + int width = this->width() - item_right_margin_ - label_start_ - accel_width;
|
| gfx::Rect text_bounds(label_start_, top_margin +
|
| (available_height - font.height()) / 2, width,
|
| font.height());
|
| @@ -84,6 +85,8 @@ void MenuItemView::Paint(gfx::Canvas* canvas, bool for_drag) {
|
| text_bounds.height(),
|
| GetRootMenuItem()->GetDrawStringFlags());
|
|
|
| + PaintAccelerator(canvas);
|
| +
|
| // Render the icon.
|
| if (icon_.width() > 0) {
|
| gfx::Rect icon_bounds(config.item_left_margin,
|
|
|