[Libreoffice-commits] core.git: vcl/source

[Jan-Marek Glogowski]

 vcl/source/window/menu.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 56bea42176e5f0b850da0bab410dda560fc89255
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Wed Feb 19 08:45:05 2014 +0000

    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

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index c2de81b..8d3e3f4 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 );