diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-05-28 18:42:39 +0900 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2015-05-29 20:16:54 +0200 |
commit | 3581b4dd6c23ab5827f6a89730909ae0fd98573d (patch) | |
tree | 2f2756e203d079b7a33e06ab0d6436a3e7470e45 | |
parent | 1d7600a2467ef2100665e43eb51f47b656d7405d (diff) |
fix drawing treelistbox with redefined background in dbaccess
Change-Id: Ia55797e3e42309f9d37d5335088f7657d99954de
Signed-off-by: Jan Holesovsky <kendy@collabora.com>
-rw-r--r-- | dbaccess/source/ui/app/AppDetailView.cxx | 6 | ||||
-rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 0ae17bf52169..7329b0b4cd3a 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -87,6 +87,8 @@ OCreationList::OCreationList( OTasksWindow& _rParent ) void OCreationList::Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect ) { + SetBackground(); + if (m_pMouseDownEntry) m_aOriginalFont = rRenderContext.GetFont(); @@ -119,11 +121,13 @@ void OCreationList::PreparePaint(vcl::RenderContext& rRenderContext, SvTreeListE // and temporary set a transparent background, for all the other // paint operations the SvTreeListBox is going to do - aEntryBackground = Wallpaper(Color(COL_TRANSPARENT)); + aEntryBackground = Wallpaper(); + _pEntry->SetBackColor(Color(COL_TRANSPARENT)); } } rRenderContext.SetBackground(aEntryBackground); + _pEntry->SetBackColor(aEntryBackground.GetColor()); } void OCreationList::SelectSearchEntry( const void* _pEntry ) diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index efb9b936e54b..13cefab3cd16 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3048,10 +3048,14 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry, long nLine, vcl::Render // realize tab listboxes with lines. if (!(nCurTab == 0 && (nTreeFlags & SvTreeFlags::USESEL) && nFirstSelTab)) { - rRenderContext.SetFillColor(aWallpaper.GetColor()); - // this case may occur for smaller horizontal resizes - if (aRect.Left() < aRect.Right()) - rRenderContext.DrawRect(aRect); + Color aBackgroundColor = aWallpaper.GetColor(); + if (aBackgroundColor != Color(COL_TRANSPARENT)) + { + rRenderContext.SetFillColor(aBackgroundColor); + // this case may occur for smaller horizontal resizes + if (aRect.Left() < aRect.Right()) + rRenderContext.DrawRect(aRect); + } } // draw item // center vertically |