summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2014-02-19 08:45:05 +0000
committerJan-Marek Glogowski <glogow@fbihome.de>2014-02-19 08:50:54 +0000
commit56bea42176e5f0b850da0bab410dda560fc89255 (patch)
tree1ff443d910e96c9917ff135482d134b0e005e0f7 /vcl
parentc1c7eeb4859bd436e711a0225ca1247fc1863110 (diff)
Fix minimal VCL menu item height with icons
Don't reset the calculated minimal menu item height to the icon height, if the minimal height is already larger then the icon height. Change-Id: Ifcd6c750352c4d3f754a693df7254a4654a8afe6
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/menu.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index c2de81b8b085..8d3e3f4b4bd4 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2412,7 +2412,8 @@ Size Menu::ImplCalcSize( const Window* pWin )
const StyleSettings& rSettings = pWin->GetSettings().GetStyleSettings();
if ( rSettings.GetUseImagesInMenus() )
{
- nMinMenuItemHeight = 16;
+ if ( 16 > nMinMenuItemHeight )
+ nMinMenuItemHeight = 16;
for ( size_t i = pItemList->size(); i; )
{
MenuItemData* pData = pItemList->GetDataFromPos( --i );