From 43775be67869de53e6cba7bc3694305dcc63f294 Mon Sep 17 00:00:00 2001 From: "Ithamar R. Adema" Date: Tue, 11 May 2010 22:54:00 +0000 Subject: [PATCH] * Revert r36316 as there are too many apps broken (Vision, Chart, Tracker Find, etc) in different unexpected ways. I'm sorry for the trouble :( I'll revisit the change and post a patch with a hopefully better solution soon.... git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36795 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/MenuItem.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/kits/interface/MenuItem.cpp b/src/kits/interface/MenuItem.cpp index 82054fb3e2..5d2dd98c8c 100644 --- a/src/kits/interface/MenuItem.cpp +++ b/src/kits/interface/MenuItem.cpp @@ -365,10 +365,7 @@ BMenuItem::GetContentSize(float *width, float *height) // BFont::Height() caches the value locally MenuPrivate(fSuper).CacheFontInfo(); - if (fSubmenu && fSubmenu->IsLabelFromMarked()) - fSubmenu->GetPreferredSize(&fCachedWidth, NULL); - else - fCachedWidth = fSuper->StringWidth(fLabel); + fCachedWidth = fSuper->StringWidth(fLabel); if (width) *width = (float)ceil(fCachedWidth);