[ooo-build-commit] .: patches/dev300

[Jan Holesovsky]

 patches/dev300/apply               |    3 -
 patches/dev300/vcl-menu-fixes.diff |   59 -------------------------------------
 2 files changed, 62 deletions(-)

New commits:
commit 977e4d09dacdb1d04b64ed4aff5ac062b9c714d6
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Aug 27 15:49:02 2010 +0200

    Moved vcl-menu-fixes.diff to the repos.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3d23f62..f1ceb24 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -339,9 +339,6 @@ gui-sw-scroll.diff, i#20826, michael
 # warnings for double-frees in alloc_cache (non-pro only)
 sal-doublefree.diff, i#67740, cmc
 
-# make menu layout prettier
-vcl-menu-fixes.diff, i#67123, n#523852, michael/jholesov
-
 # Tell the desktop we support the VFS
 uses-vfs.diff, i#43504, michael
 
diff --git a/patches/dev300/vcl-menu-fixes.diff b/patches/dev300/vcl-menu-fixes.diff
deleted file mode 100644
index 95aa5e4..0000000
--- a/patches/dev300/vcl-menu-fixes.diff
+++ /dev/null
@@ -1,59 +0,0 @@
----
- vcl/source/window/menu.cxx |   13 ++++++++++---
- 1 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git vcl/source/window/menu.cxx vcl/source/window/menu.cxx
-index fcff242..0e1ec31 100644
---- vcl/source/window/menu.cxx
-+++ vcl/source/window/menu.cxx
-@@ -957,7 +957,7 @@ void Menu::ImplInit()
- {
-     mnHighlightedItemPos = ITEMPOS_INVALID;
-     mpSalMenu       = NULL;
--    nMenuFlags      = MENU_FLAG_SHOWCHECKIMAGES;
-+    nMenuFlags      = 0;
-     nDefaultItem    = 0;
-     //bIsMenuBar      = FALSE;  // this is now set in the ctor, must not be changed here!!!
-     nSelectedId     = 0;
-@@ -2280,6 +2280,10 @@ Size Menu::ImplCalcSize( Window* pWin )
-     if( nMax > nMinMenuItemHeight )
-         nMinMenuItemHeight = nMax;
- 
-+    // When no native rendering of the checkbox & no image in the menu, we
-+    // have to add some extra space even in the MENU_FLAG_SHOWCHECKIMAGES case
-+    bool bSpaceForCheckbox = ( nMax == 0 );
-+
-     const StyleSettings& rSettings = pWin->GetSettings().GetStyleSettings();
-     if ( rSettings.GetUseImagesInMenus() )
-     {
-@@ -2289,6 +2293,9 @@ Size Menu::ImplCalcSize( Window* pWin )
-             MenuItemData* pData = pItemList->GetDataFromPos( --i );
-             if ( ImplIsVisible( i ) && (( pData->eType == MENUITEM_IMAGE ) || ( pData->eType == MENUITEM_STRINGIMAGE )))
-             {
-+                // we have an icon, don't add the extra space
-+                bSpaceForCheckbox = false;
-+
-                 Size aImgSz = pData->aImage.GetSizePixel();
-                 if ( aImgSz.Height() > aMaxImgSz.Height() )
-                     aMaxImgSz.Height() = aImgSz.Height();
-@@ -2335,7 +2342,7 @@ Size Menu::ImplCalcSize( Window* pWin )
-             if ( !bIsMenuBar && pData->HasCheck() )
-             {
-                 nCheckWidth = nMaxCheckWidth;
--                if (nMenuFlags & MENU_FLAG_SHOWCHECKIMAGES)
-+                if ( ( nMenuFlags & MENU_FLAG_SHOWCHECKIMAGES ) || bSpaceForCheckbox )
-                 {
-                     // checks / images take the same place
-                     if( ! ( ( pData->eType == MENUITEM_IMAGE ) || ( pData->eType == MENUITEM_STRINGIMAGE ) ) )
-@@ -2399,7 +2406,7 @@ Size Menu::ImplCalcSize( Window* pWin )
-     {
-         USHORT gfxExtra = (USHORT) Max( nExtra, 7L ); // #107710# increase space between checkmarks/images/text
-         nCheckPos = (USHORT)nExtra;
--        if (nMenuFlags & MENU_FLAG_SHOWCHECKIMAGES)
-+        if ( ( nMenuFlags & MENU_FLAG_SHOWCHECKIMAGES ) || bSpaceForCheckbox )
-         {
-             long nImgOrChkWidth = 0;
-             nImagePos = nCheckPos;
--- 
-1.7.0.1
-