diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 15:42:46 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 15:42:46 +0000 |
| commit | 3687e56fa0e661877a339b97bf52def66d13b801 (patch) | |
| tree | 220174e81b579c14ac09b9946e6dad193a69a01c /vcl/source | |
| parent | 98b7f9c707d9b6693b7335e59b0f27d9575e6ffa (diff) | |
INTEGRATION: CWS tkr06 (1.15.132); FILE MERGED
2007/11/07 09:57:22 cd 1.15.132.1: #i83238# Draw method for tabpages and dialogs must call ImplInitSettings for non-bitmap wallpapers
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/tabpage.cxx | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 8b91263cb781..dcc43386a95a 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tabpage.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: hr $ $Date: 2007-06-27 20:34:50 $ + * last change: $Author: ihi $ $Date: 2007-11-26 16:42:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -56,6 +56,7 @@ #ifndef _SV_TABCTRL_HXX #include <vcl/tabctrl.hxx> #endif +#include <vcl/bitmapex.hxx> #ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_ #include <com/sun/star/accessibility/XAccessible.hpp> @@ -190,14 +191,24 @@ void TabPage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, UL Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); - ImplInitSettings(); + Wallpaper aWallpaper = GetBackground(); + if ( !aWallpaper.IsBitmap() ) + ImplInitSettings(); pDev->Push(); pDev->SetMapMode(); pDev->SetLineColor(); - pDev->SetFillColor( GetSettings().GetStyleSettings().GetDialogColor() ); - pDev->DrawRect( Rectangle( aPos, aSize ) ); + if ( aWallpaper.IsBitmap() ) + pDev->DrawBitmapEx( aPos, aSize, aWallpaper.GetBitmap() ); + else + { + if( aWallpaper.GetColor() == COL_AUTO ) + pDev->SetFillColor( GetSettings().GetStyleSettings().GetDialogColor() ); + else + pDev->SetFillColor( aWallpaper.GetColor() ); + pDev->DrawRect( Rectangle( aPos, aSize ) ); + } pDev->Pop(); } |