diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 20:51:02 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 20:51:02 +0000 |
commit | 40e59f901bc45d009b01b5252dc1e6140ba67642 (patch) | |
tree | 880793e36522e87653c88b867b6e166d2a8d33c2 /views/controls/menu/menu_item_view_win.cc | |
parent | 34831e0d903dc77863f64096e73f136f4742269b (diff) | |
download | chromium_src-40e59f901bc45d009b01b5252dc1e6140ba67642.zip chromium_src-40e59f901bc45d009b01b5252dc1e6140ba67642.tar.gz chromium_src-40e59f901bc45d009b01b5252dc1e6140ba67642.tar.bz2 |
Attempt 2 at landing bookmark menus.
The build breakage was the result of a bad ifdef in MenuController,
specifically around the OnKeyDown method.
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/173517
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/menu_item_view_win.cc')
-rw-r--r-- | views/controls/menu/menu_item_view_win.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/views/controls/menu/menu_item_view_win.cc b/views/controls/menu/menu_item_view_win.cc index 8f3812c..8ec80eb3 100644 --- a/views/controls/menu/menu_item_view_win.cc +++ b/views/controls/menu/menu_item_view_win.cc @@ -19,6 +19,13 @@ using gfx::NativeTheme; namespace views { +gfx::Size MenuItemView::GetPreferredSize() { + const gfx::Font& font = MenuConfig::instance().font; + return gfx::Size( + font.GetStringWidth(title_) + label_start_ + item_right_margin_, + font.height() + GetBottomMargin() + GetTopMargin()); +} + void MenuItemView::Paint(gfx::Canvas* canvas, bool for_drag) { const MenuConfig& config = MenuConfig::instance(); bool render_selection = |