diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-03 20:59:02 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-05 10:14:45 +0100 |
| commit | 84770240ee911393eb3e29f446e7c324843c5c6c (patch) | |
| tree | a68792e3a53ab128426a7380b5f87005bb707013 /vcl | |
| parent | 8b13d9a0cd76b04631db5b901ae433aecb955c30 (diff) | |
nCheckPos and nImagePos are always the same value, merge together
Change-Id: I41bf6eada1fbeaa9548f81b3bf4fd9d4f4f6871a
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/menu.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/menu.cxx | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx index 97dd29ce932e..60bd029c9157 100644 --- a/vcl/inc/vcl/menu.hxx +++ b/vcl/inc/vcl/menu.hxx @@ -158,8 +158,7 @@ private: sal_uInt16 nSelectedId; // Fuer Ausgabe: - sal_uInt16 nCheckPos; - sal_uInt16 nImagePos; + sal_uInt16 nImgOrChkPos; sal_uInt16 nTextPos; sal_Bool bIsMenuBar : 1, // Handelt es sich um den MenuBar diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index cb7781da2b2c..2987267527d0 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2501,22 +2501,20 @@ Size Menu::ImplCalcSize( Window* pWin ) nMaxWidth = nScreenWidth/2; sal_uInt16 gfxExtra = (sal_uInt16) Max( nExtra, 7L ); // #107710# increase space between checkmarks/images/text - nCheckPos = (sal_uInt16)nExtra; + nImgOrChkPos = (sal_uInt16)nExtra; if ( ( nMenuFlags & MENU_FLAG_SHOWCHECKIMAGES ) || bSpaceForCheckbox ) { long nImgOrChkWidth = 0; - nImagePos = nCheckPos; if( aMaxSize.Height() > 0 ) // NWF case nImgOrChkWidth = aMaxSize.Height() + nExtra; else // non NWF case nImgOrChkWidth = nFontHeight/2 + gfxExtra; nImgOrChkWidth = Max( nImgOrChkWidth, aMaxImgSz.Width() + gfxExtra ); - nTextPos = (sal_uInt16)(nImagePos + nImgOrChkWidth); + nTextPos = (sal_uInt16)(nImgOrChkPos + nImgOrChkWidth); } else { - nImagePos = nCheckPos; - nTextPos = (sal_uInt16)(nImagePos + Max( aMaxImgSz.Width(), nCheckWidth )); + nTextPos = (sal_uInt16)(nImgOrChkPos + Max( aMaxImgSz.Width(), nCheckWidth )); } nTextPos = nTextPos + gfxExtra; @@ -2732,7 +2730,7 @@ void Menu::ImplPaint( Window* pWin, sal_uInt16 nBorder, long nStartY, MenuItemDa } } - Rectangle aOuterCheckRect( Point( aPos.X()+nCheckPos, aPos.Y() ), Size( pData->aSz.Height(), pData->aSz.Height() ) ); + Rectangle aOuterCheckRect( Point( aPos.X()+nImgOrChkPos, aPos.Y() ), Size( pData->aSz.Height(), pData->aSz.Height() ) ); aOuterCheckRect.Left() += 1; aOuterCheckRect.Right() -= 1; aOuterCheckRect.Top() += 1; |