strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed ToolbarMenu drawing text over controls if any

Browse source
This commit is contained in:
Cédric Bosdonnat 2011-02-07 11:30:59 +01:00
parent 1217c1eb0b
commit 3200629612
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
svtools/source/control/toolbarmenu.cxx
View file

@ -1493,6 +1493,7 @@ void ToolbarMenu::implPaint( ToolbarMenuEntry* pThisOnly, bool bHighlighted )
Rectangle aCheckRect( aTmpPos, Size( nCtrlHeight, nCtrlHeight ) ); Rectangle aCheckRect( aTmpPos, Size( nCtrlHeight, nCtrlHeight ) );
DrawNativeControl( CTRL_MENU_POPUP, nPart, aCheckRect, nState, ImplControlValue(), OUString() ); DrawNativeControl( CTRL_MENU_POPUP, nPart, aCheckRect, nState, ImplControlValue(), OUString() );
aPos.setX( aPos.getX() + nCtrlHeight + 1 );
} }
else if ( pEntry->mbChecked ) // by default do nothing for unchecked items else if ( pEntry->mbChecked ) // by default do nothing for unchecked items
{ {
@ -1514,6 +1515,7 @@ void ToolbarMenu::implPaint( ToolbarMenuEntry* pThisOnly, bool bHighlighted )
aTmpPos.Y() = aOuterCheckRect.Top() + (aOuterCheckRect.GetHeight() - aSymbolSize.Height())/2; aTmpPos.Y() = aOuterCheckRect.Top() + (aOuterCheckRect.GetHeight() - aSymbolSize.Height())/2;
Rectangle aRect( aTmpPos, aSymbolSize ); Rectangle aRect( aTmpPos, aSymbolSize );
aDecoView.DrawSymbol( aRect, eSymbol, GetTextColor(), nSymbolStyle ); aDecoView.DrawSymbol( aRect, eSymbol, GetTextColor(), nSymbolStyle );
aPos.setX( aPos.getX() + aSymbolSize.getWidth( ) + 1 );
} }
} }
} }