vcl117: #i115607# support NWF for menus on Windows

2 files changed, 50 insertions, 73 deletions

diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx
index 521f4d7ea62d..b5b745b708fa 100644..100755
--- a/vcl/source/gdi/outdevnative.cxx
+++ b/vcl/source/gdi/outdevnative.cxx
@@ -87,6 +87,10 @@ MenubarValue::~MenubarValue()
 {
 }
 
+MenupopupValue::~MenupopupValue()
+{
+}
+
 PushButtonValue::~PushButtonValue()
 {
 }
@@ -200,49 +204,20 @@ static boost::shared_ptr< ImplControlValue > lcl_transformControlValue( const Im
     case CTRL_GENERIC:
             aResult.reset( new ImplControlValue( rVal ) );
             break;
-    default:
-        OSL_ENSURE( 0, "unknown ImplControlValue type !" );
-        break;
-    }
-    return aResult;
-}
-
-#if 0
-static void lcl_moveControlValue( ControlType nType, const ImplControlValue& aValue, const Point& rDelta )
-{
-    switch( aValue.getType() )
-    {
-        case CTRL_SLIDER:
-        {
-            SliderValue* pSlVal = static_cast<SliderValue*>(const_cast<ImplControlValue*>(&aValue));
-            pSlVal->maThumbRect.Move( rDelta.X(), rDelta.Y() );
-        }
-        break;
-        case CTRL_SCROLLBAR:
-        {
-            ScrollbarValue* pScVal = static_cast<ScrollbarValue*>(const_cast<ImplControlValue*>(&aValue));
-            pScVal->maThumbRect.Move( rDelta.X(), rDelta.Y() );
-            pScVal->maButton1Rect.Move( rDelta.X(), rDelta.Y() );
-            pScVal->maButton2Rect.Move( rDelta.X(), rDelta.Y() );
-        }
-        break;
-        case CTRL_SPINBOX:
-        case CTRL_SPINBUTTONS:
+    case CTRL_MENU_POPUP:
         {
-            SpinbuttonValue* pSpVal = static_cast<SpinbuttonValue*>(const_cast<ImplControlValue*>(&aValue));
-            pSpVal->maUpperRect.Move( rDelta.X(), rDelta.Y() );
-            pSpVal->maLowerRect.Move( rDelta.X(), rDelta.Y() );
+            const MenupopupValue* pMVal = static_cast<const MenupopupValue*>(&rVal);
+            MenupopupValue* pNew = new MenupopupValue( *pMVal );
+            pNew->maItemRect = rDev.ImplLogicToDevicePixel( pMVal->maItemRect );
+            aResult.reset( pNew );
         }
         break;
-        case CTRL_TOOLBAR:
-        {
-            ToolbarValue* pTVal = static_cast<ToolbarValue*>(const_cast<ImplControlValue*>(&aValue));
-            pTVal->maGripRect.Move( rDelta.X(), rDelta.Y() );
-        }
+    default:
+        OSL_ENSURE( 0, "unknown ImplControlValue type !" );
         break;
     }
+    return aResult;
 }
-#endif
 
 BOOL OutputDevice::DrawNativeControl( ControlType nType,
                             ControlPart nPart,
@@ -254,20 +229,6 @@ BOOL OutputDevice::DrawNativeControl( ControlType nType,
     if( !lcl_enableNativeWidget( *this ) )
         return FALSE;
 
-    /*
-    if( !IsInPaint() && IsPaintTransparent() )
-    {
-        // only required if called directly (ie, we're not in Paint() ):
-        // force redraw (Paint()) for transparent controls
-        // to trigger a repaint of the background
-        Region aClipRgn( GetClipRegion() );
-        if( !rControlRegion.IsEmpty() )
-            aClipRgn.Intersect( rControlRegion );
-        Invalidate( aClipRgn, INVALIDATE_UPDATE );
-        return TRUE;
-    }
-    */
-
     // make sure the current clip region is initialized correctly
     if ( !mpGraphics )
         if ( !ImplGetGraphics() )
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 52ad54957dd0..5909ab9f8489 100644..100755
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -96,6 +96,7 @@ DBG_NAME( Menu )
 
 #define EXTRASPACEY         2
 #define EXTRAITEMHEIGHT     4
+#define GUTTERBORDER        8
 
 // document closer
 #define IID_DOCUMENTCLOSE 1
@@ -2670,14 +2671,36 @@ void Menu::ImplPaint( Window* pWin, USHORT nBorder, long nStartY, MenuItemData*
                 // Separator
                 if ( !bLayout && !bIsMenuBar && ( pData->eType == MENUITEM_SEPARATOR ) )
                 {
-                    aTmpPos.Y() = aPos.Y() + ((pData->aSz.Height()-2)/2);
-                    aTmpPos.X() = aPos.X() + 2 + nOuterSpace;
-                    pWin->SetLineColor( rSettings.GetShadowColor() );
-                    pWin->DrawLine( aTmpPos, Point( aOutSz.Width() - 3 - 2*nOuterSpace, aTmpPos.Y() ) );
-                    aTmpPos.Y()++;
-                    pWin->SetLineColor( rSettings.GetLightColor() );
-                    pWin->DrawLine( aTmpPos, Point( aOutSz.Width() - 3 - 2*nOuterSpace, aTmpPos.Y() ) );
-                    pWin->SetLineColor();
+                    bool bNativeOk = false;
+                    if( pWin->IsNativeControlSupported( CTRL_MENU_POPUP,
+                                                        PART_MENU_SEPARATOR ) )
+                    {
+                        ControlState nState = 0;
+                        if ( pData->bEnabled )
+                            nState |= CTRL_STATE_ENABLED;
+                        if ( bHighlighted )
+                            nState |= CTRL_STATE_SELECTED;
+                        Size aSz( pData->aSz );
+                        aSz.Width() = aOutSz.Width() - 2*nOuterSpace;
+                        Rectangle aItemRect( aPos, aSz );
+                        MenupopupValue aVal( nTextPos-GUTTERBORDER, aItemRect );
+                        bNativeOk = pWin->DrawNativeControl( CTRL_MENU_POPUP, PART_MENU_SEPARATOR,
+                                                             aItemRect,
+                                                             nState,
+                                                             aVal,
+                                                             OUString() );
+                    }
+                    if( ! bNativeOk )
+                    {
+                        aTmpPos.Y() = aPos.Y() + ((pData->aSz.Height()-2)/2);
+                        aTmpPos.X() = aPos.X() + 2 + nOuterSpace;
+                        pWin->SetLineColor( rSettings.GetShadowColor() );
+                        pWin->DrawLine( aTmpPos, Point( aOutSz.Width() - 3 - 2*nOuterSpace, aTmpPos.Y() ) );
+                        aTmpPos.Y()++;
+                        pWin->SetLineColor( rSettings.GetLightColor() );
+                        pWin->DrawLine( aTmpPos, Point( aOutSz.Width() - 3 - 2*nOuterSpace, aTmpPos.Y() ) );
+                        pWin->SetLineColor();
+                    }
                 }
 
                 Rectangle aOuterCheckRect( Point( aPos.X()+nCheckPos, aPos.Y() ), Size( pData->aSz.Height(), pData->aSz.Height() ) );
@@ -2722,10 +2745,11 @@ void Menu::ImplPaint( Window* pWin, USHORT nBorder, long nStartY, MenuItemData*
                             aTmpPos.Y() = aOuterCheckRect.Top() + (aOuterCheckRect.GetHeight() - nCtrlHeight)/2;
 
                             Rectangle aCheckRect( aTmpPos, Size( nCtrlHeight, nCtrlHeight ) );
+                            MenupopupValue aVal( nTextPos-GUTTERBORDER, Rectangle( aPos, pData->aSz ) );
                             pWin->DrawNativeControl( CTRL_MENU_POPUP, nPart,
                                                      aCheckRect,
                                                      nState,
-                                                     ImplControlValue(),
+                                                     aVal,
                                                      OUString() );
                         }
                         else if ( pData->bChecked ) // by default do nothing for unchecked items
@@ -2845,16 +2869,6 @@ void Menu::ImplPaint( Window* pWin, USHORT nBorder, long nStartY, MenuItemData*
                     aDecoView.DrawSymbol(
                         Rectangle( aTmpPos, Size( nFontHeight/2, nFontHeight/2 ) ),
                         SYMBOL_SPIN_RIGHT, pWin->GetTextColor(), nSymbolStyle );
-//                  if ( pData->nBits & MIB_POPUPSELECT )
-//                  {
-//                      aTmpPos.Y() += nFontHeight/2 ;
-//                      pWin->SetLineColor( rSettings.GetShadowColor() );
-//                      pWin->DrawLine( aTmpPos, Point( aTmpPos.X() + nFontHeight/3, aTmpPos.Y() ) );
-//                      pWin->SetLineColor( rSettings.GetLightColor() );
-//                      aTmpPos.Y()++;
-//                      pWin->DrawLine( aTmpPos, Point( aTmpPos.X() + nFontHeight/3, aTmpPos.Y() ) );
-//                      pWin->SetLineColor();
-//                  }
                 }
 
                 if ( pThisItemOnly && bHighlighted )
@@ -4724,10 +4738,11 @@ void MenuFloatingWindow::HighlightItem( USHORT nPos, BOOL bHighlight )
                     Push( PUSH_CLIPREGION );
                     IntersectClipRegion( Rectangle( Point( nX, nY ), Size( aSz.Width(), pData->aSz.Height() ) ) );
                     Rectangle aCtrlRect( Point( nX, 0 ), Size( aPxSize.Width()-nX, aPxSize.Height() ) );
+                    MenupopupValue aVal( pMenu->nTextPos-GUTTERBORDER, aItemRect );
                     DrawNativeControl( CTRL_MENU_POPUP, PART_ENTIRE_CONTROL,
                                        aCtrlRect,
                                        CTRL_STATE_ENABLED,
-                                       ImplControlValue(),
+                                       aVal,
                                        OUString() );
                     if( bHighlight &&
                         IsNativeControlSupported( CTRL_MENU_POPUP, PART_MENU_ITEM ) )
@@ -4736,7 +4751,7 @@ void MenuFloatingWindow::HighlightItem( USHORT nPos, BOOL bHighlight )
                         if( FALSE == DrawNativeControl( CTRL_MENU_POPUP, PART_MENU_ITEM,
                                                         aItemRect,
                                                         CTRL_STATE_SELECTED | ( pData->bEnabled? CTRL_STATE_ENABLED: 0 ),
-                                                        ImplControlValue(),
+                                                        aVal,
                                                         OUString() ) )
                         {
                             bDrawItemRect = bHighlight;
@@ -5071,10 +5086,11 @@ void MenuFloatingWindow::Paint( const Rectangle& )
         long nX = pMenu->pLogo ? pMenu->pLogo->aBitmap.GetSizePixel().Width() : 0;
         Size aPxSize( GetOutputSizePixel() );
         aPxSize.Width() -= nX;
+        ImplControlValue aVal( pMenu->nTextPos-GUTTERBORDER );
         DrawNativeControl( CTRL_MENU_POPUP, PART_ENTIRE_CONTROL,
                            Rectangle( Point( nX, 0 ), aPxSize ),
                            CTRL_STATE_ENABLED,
-                           ImplControlValue(),
+                           aVal,
                            OUString() );
         ImplInitClipRegion();
     }