diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-02-19 08:45:05 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-08-20 09:44:38 +0200 |
| commit | e029c3535c6c6a1ee01f1f6397abfae2f8c5bb0d (patch) | |
| tree | 5e08f16a85a43d35c710268c813cf74798930fea | |
| parent | a51b25a7931d8f389aa5893d883dabb0dafb8e55 (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
(cherry picked from commit 56bea42176e5f0b850da0bab410dda560fc89255)
| -rw-r--r-- | vcl/source/window/menu.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 2d391893cea1..89871c7a3e4d 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2385,7 +2385,8 @@ Size Menu::ImplCalcSize( 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 ); |