diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 22:46:50 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 22:46:50 +0000 |
| commit | 440d8dba5acdec78133af93ca788a9e995fedb49 (patch) | |
| tree | 994f2a5206ed93f3c79bb4ac57a7e63aa5d5fc37 /views/controls/menu/menu_item_view_gtk.cc | |
| parent | 02a46a3c1f824675fe72f5fe6a7b95694452a1eb (diff) | |
| download | chromium_src-440d8dba5acdec78133af93ca788a9e995fedb49.zip chromium_src-440d8dba5acdec78133af93ca788a9e995fedb49.tar.gz chromium_src-440d8dba5acdec78133af93ca788a9e995fedb49.tar.bz2 | |
Adds support for showing accelerators in bookmark menus.
BUG=45734
TEST=none
Review URL: http://codereview.chromium.org/2742003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/menu_item_view_gtk.cc')
| -rw-r--r-- | views/controls/menu/menu_item_view_gtk.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc index 3f0a830..74255d1 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, |