diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-04-28 11:33:03 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-04-28 11:36:11 +0200 |
| commit | 789d3b363f9a0619d14b37a74f37809d05230594 (patch) | |
| tree | 2a0249e48f8cc6cdac6e4f06324d81c8d6236298 | |
| parent | 4ccdf41bd03a756c0e8d598fb3788e63433872c8 (diff) | |
fdo#78030 - Bitmaps are missing allover the UI
Original behavior was to call DrawBitmap without the size argument.
case IMAGETYPE_BITMAP:
{
const Bitmap &rBitmap = *static_cast< Bitmap* >( rImage.mpImplData->mpData );
if( nStyle & IMAGE_DRAW_DISABLE )
DrawBitmapEx( rPos, makeDisabledBitmap(rBitmap) );
else
DrawBitmap( rPos, rBitmap );
}
break;
A check of bIsValidSize is needed here, too.
This brings the missing bitmaps back.
Change-Id: I60582090a7543b3916b15675af1a5ec9ee216270
| -rw-r--r-- | vcl/source/outdev/bitmap.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index 46d58da33356..e0841a60a25a 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -1160,7 +1160,10 @@ void OutputDevice::DrawImage( const Point& rPos, const Size& rSize, } else { - DrawBitmap( rPos, rSize, rBitmap ); + if ( bIsSizeValid ) + DrawBitmap( rPos, rSize, rBitmap ); + else + DrawBitmap( rPos, rBitmap ); } } break; |