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

Slidesorter: Kill unused maButtonDownBackground.

Browse source
This commit is contained in:
Jan Holesovsky 2012-02-17 21:35:13 +01:00
parent c6b151f1f8
commit ebd3d9c77e
2 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
View file

@ -143,7 +143,6 @@ private:
::std::vector<SharedButton> maRegularButtons;
::std::vector<SharedButton> maExcludedButtons;
BitmapEx maNormalBackground;
BitmapEx maButtonDownBackground;
bool mbIsMouseOverBar;
::boost::scoped_ptr<BackgroundTheme> mpBackgroundTheme;
int mnLockCount;

20
sd/source/ui/slidesorter/view/SlsButtonBar.cxx
View file

@ -159,7 +159,6 @@ ButtonBar::ButtonBar (SlideSorter& rSlideSorter)
maRegularButtons(),
maExcludedButtons(),
maNormalBackground(),
maButtonDownBackground(),
mbIsMouseOverBar(false),
mpBackgroundTheme(),
mnLockCount(0)
@ -409,27 +408,19 @@ void ButtonBar::PaintButtonBackground (
const model::SharedPageDescriptor& rpDescriptor,
const Point aOffset)
{
BitmapEx* pBitmap = NULL;
if (maButtonDownBackground.IsEmpty() || maNormalBackground.IsEmpty())
if (maNormalBackground.IsEmpty())
{
if (mpBackgroundTheme)
{
maButtonDownBackground = mpBackgroundTheme->CreateBackground();
maNormalBackground = mpBackgroundTheme->CreateBackground();
}
}
if (mpButtonUnderMouse && mpButtonUnderMouse->IsDown())
pBitmap = &maButtonDownBackground;
else
pBitmap = &maNormalBackground;
if (pBitmap != NULL)
if (!maNormalBackground.IsEmpty())
{
AlphaMask aMask (pBitmap->GetSizePixel());
AlphaMask aMask (maNormalBackground.GetSizePixel());
AdaptTransparency(
aMask,
pBitmap->GetAlpha(),
maNormalBackground.GetAlpha(),
rpDescriptor->GetVisualState().GetButtonBarAlpha());
rDevice.DrawBitmapEx(maBackgroundLocation+aOffset, BitmapEx(pBitmap->GetBitmap(), aMask));
rDevice.DrawBitmapEx(maBackgroundLocation+aOffset, BitmapEx(maNormalBackground.GetBitmap(), aMask));
}
}
@ -469,7 +460,6 @@ void ButtonBar::LayoutButtons (const Size aPageObjectSize)
// Release the background bitmaps so that on the next paint
// they are created anew in the right size.
maNormalBackground.SetEmpty();
maButtonDownBackground.SetEmpty();
}
}