Attachment #9380 for issue #19646

View | Details | Raw Unified | Return to issue 19646
Collapse All | Expand All

Lines 91-96 Link Here

(-)vcl/unx/source/gdi/salbmp.cxx (+15 lines)
91	#ifndef _SV_SALBMP_HXX	91	#ifndef _SV_SALBMP_HXX
92	#include <salbmp.hxx>	92	#include <salbmp.hxx>
93	#endif	93	#endif
		94	#ifndef _SV_SALFRAME_HXX
		95	#include <salframe.hxx>
		96	#endif
94		97
95	// -----------	98	// -----------
96	// - Defines -	99	// - Defines -
Lines 1140-1143 void ImplSalBitmapCache::ImplClear() Link Here
1140		1146
1141	maBmpList.Clear();	1147	maBmpList.Clear();
1142	mnTotalSize = 0;	1148	mnTotalSize = 0;
		1149	}
		1150
		1151	void
		1152	SalBitmap::SetWindowBg( SalFrame *pFrame )
		1153	{
		1154	if( !pFrame )
		1155	return;
		1156
		1157	XLIB_Window window = pFrame->maFrameData.GetWindow();
		1158	DBG_ASSERT( mpDDB, "SetWindowBg needs valid DDB" );
		1159	XSetWindowBackgroundPixmap (pFrame->maFrameData.GetXDisplay (),
		1160	window, mpDDB->ImplGetPixmap ());
1143	}	1161	}

Lines 133-138 public: Link Here

(-)vcl/unx/inc/salbmp.hxx (+1 lines)
133	void ImplDraw( Drawable aDrawable, long nDrawableDepth,	133	void ImplDraw( Drawable aDrawable, long nDrawableDepth,
134	const SalTwoRect& rTwoRect, const GC& rGC ) const;	134	const SalTwoRect& rTwoRect, const GC& rGC ) const;
135	#endif	135	#endif
		136	void SetWindowBg( SalFrame *pFrame );
136		137
137	public:	138	public:
138		139

Lines 97-102 Link Here

(-)vcl/source/window/introwin.cxx (+29 lines)
97	#ifndef _SV_OPENGL_HXX	97	#ifndef _SV_OPENGL_HXX
98	#include <opengl.hxx>	98	#include <opengl.hxx>
99	#endif	99	#endif
		100	#ifndef _SV_BITMAP_HXX
		101	#include <bitmap.hxx>
		102	#endif
		103	#ifndef _SV_BITMAPEX_HXX
		104	#include <bitmapex.hxx>
		105	#endif
		106	#ifndef _SV_IMPBMP_HXX
		107	#include <impbmp.hxx>
		108	#endif
		109	#ifndef _SV_SALBMP_HXX
		110	#include <salbmp.hxx>
		111	#endif
100		112
101	#include <introwin.hxx>	113	#include <introwin.hxx>
102		114
Lines 129-132 IntroWindow::~IntroWindow() Link Here
129	pSVData->mpIntroWindow = NULL;	141	pSVData->mpIntroWindow = NULL;
130	}	142	}
131		143
		144	void
		145	IntroWindow::SetBackgroundBitmap( const Bitmap &rBitmap )
		146	{
		147	SetBackground( Wallpaper( BitmapEx( rBitmap ) ) );
		148	}
132		149
		150	void
		151	IntroWindow::Paint( const Rectangle &rRect )
		152	{
		153	Bitmap aBmp( GetBackground().GetBitmap().GetBitmap() );
		154
		155	DrawBitmap( Point(), aBmp );
		156	#ifdef UNX
		157	ImpBitmap *pImpBmp = aBmp.ImplGetImpBitmap();
		158	if( pImpBmp )
		159	pImpBmp->ImplGetSalBitmap ()->SetWindowBg( ImplGetFrame() );
		160	#endif
		161	}

Lines 82-87 private: Link Here

(-)vcl/inc/introwin.hxx (+2 lines)
82	public:	82	public:
83	IntroWindow();	83	IntroWindow();
84	~IntroWindow();	84	~IntroWindow();
		85	void IntroWindow::SetBackgroundBitmap( const Bitmap &rBitmap );
		86	virtual void Paint( const Rectangle& );
85	};	87	};
86		88
87	#endif // _SV_INTROWIN_HXX	89	#endif // _SV_INTROWIN_HXX




			_aIntroBmp = Bitmap( aIntroBmpRes );
			delete pLabelResMgr;
		}
		SetBackgroundBitmap( _aIntroBmp );
	}
}

void SplashScreen::Paint( const Rectangle& rRect )
{
	if(!_bVisible) return;
	// draw bitmap
	if (_bPaintBitmap)
        IntroWindow::Paint( rRect );

	if (_bPaintProgress) {
		// draw progress...

Return to issue 19646

Lines 235-249 void SplashScreen::initBitmap() Link Here

(-)desktop/source/splash/splash.cxx (-2 / +3 lines)
235	_aIntroBmp = Bitmap( aIntroBmpRes );	235	_aIntroBmp = Bitmap( aIntroBmpRes );
236	delete pLabelResMgr;	236	delete pLabelResMgr;
237	}	237	}
		238	SetBackgroundBitmap( _aIntroBmp );
238	}	239	}
239	}	240	}
240		241
241	void SplashScreen::Paint( const Rectangle& )	242	void SplashScreen::Paint( const Rectangle& rRect )
242	{	243	{
243	if(!_bVisible) return;	244	if(!_bVisible) return;
244	// draw bitmap	245	// draw bitmap
245	if (_bPaintBitmap)	246	if (_bPaintBitmap)
246	DrawBitmap( Point(), _aIntroBmp );	247	IntroWindow::Paint( rRect );
247		248
248	if (_bPaintProgress) {	249	if (_bPaintProgress) {
249	// draw progress...	250	// draw progress...