diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-30 16:29:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-30 16:33:10 +0100 |
| commit | 9a2120a4814975f52648700bb11ceec1df42f79b (patch) | |
| tree | c2e415fe137cf1fc631223207e6356caf5dc7187 | |
| parent | 384f9ef47b18dba56c5bf88d5d7aa8340321a380 (diff) | |
Resolves: fdo#80681 widget is not transparent
regression from 12dfca2ea61116665a7abefd43a9a4caa2b8920b
Author: Armin Le Grand <alg@apache.org>
Date: Mon May 14 15:16:00 2012 +0000
Resolves: #i119307# added deletion of sw's BmpWindow control...
...due to the fact that graphics may be transparent
Change-Id: I7eb2ee8ed53f0ef907a4573a735c71de43b6e8d3
(cherry picked from commit 1caad856de1c1c5b0a8c31d2226416a2db9632cd)
| -rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 9a9cc62cc57b..cd22bb59669a 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2605,8 +2605,12 @@ BmpWindow::BmpWindow(Window* pPar, WinBits nStyle) , bGraphic(false) , bLeftAlign(false) { - // #i119307# use background, the graphic might have transparency - SetBackground(Wallpaper(Color(COL_WHITE))); + SetBackground(); + SetPaintTransparent(sal_True); + // #i119307# the graphic might have transparency, set up white as the color + // to use when drawing a rectangle under the image + SetLineColor(COL_WHITE); + SetFillColor(COL_WHITE); } Size BmpWindow::GetOptimalSize() const @@ -2664,7 +2668,7 @@ void BmpWindow::Paint( const Rectangle& ) } // #i119307# clear window background, the graphic might have transparency - Erase(); + DrawRect(Rectangle(aPntPos, aPntSz)); if ( bGraphic ) aGraphic.Draw( this, aPntPos, aPntSz ); |