diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-05-18 15:13:54 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-05-18 15:55:02 +0900 |
| commit | c24e30977091dcc8643a14e5f2ce9f85d6b803f0 (patch) | |
| tree | d32b842fdd3025b0a8667cbc34b271278a2636a0 | |
| parent | 7092c767b54df65e64b6059a531de4950c1a3b92 (diff) | |
cleanup Paint, copy more settings to virtual device
Change-Id: I795784f9f3878abd6db3400d81a56a63458c1b3f
| -rw-r--r-- | vcl/source/window/paint.cxx | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index a7aa9b47288c..2ee0dbac3b5c 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -98,24 +98,26 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion) { WindowImpl* pWindowImpl = m_pWindow->ImplGetWindowImpl(); vcl::Region* pWinChildClipRegion = m_pWindow->ImplGetWinChildClipRegion(); - if ( pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL ) + if (pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL) + { pWindowImpl->maInvalidateRegion = *pWinChildClipRegion; + } else { - if ( pRegion ) + if (pRegion) pWindowImpl->maInvalidateRegion.Union( *pRegion ); - if( pWindowImpl->mpWinData && pWindowImpl->mbTrackVisible ) + if (pWindowImpl->mpWinData && pWindowImpl->mbTrackVisible) /* #98602# need to repaint all children within the * tracking rectangle, so the following invert * operation takes places without traces of the previous * one. */ - pWindowImpl->maInvalidateRegion.Union( *pWindowImpl->mpWinData->mpTrackRect ); + pWindowImpl->maInvalidateRegion.Union(*pWindowImpl->mpWinData->mpTrackRect); - if ( pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALLCHILDREN ) - m_pChildRegion = new vcl::Region( pWindowImpl->maInvalidateRegion ); - pWindowImpl->maInvalidateRegion.Intersect( *pWinChildClipRegion ); + if (pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALLCHILDREN) + m_pChildRegion = new vcl::Region(pWindowImpl->maInvalidateRegion); + pWindowImpl->maInvalidateRegion.Intersect(*pWinChildClipRegion); } pWindowImpl->mnPaintFlags = 0; if (!pWindowImpl->maInvalidateRegion.IsEmpty()) @@ -141,6 +143,15 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion) pDevice->SetMapMode(m_pWindow->GetMapMode()); pDevice->SetRefPoint(m_pWindow->GetRefPoint()); pDevice->SetSettings(m_pWindow->GetSettings()); + pDevice->SetTextColor(m_pWindow->GetTextColor()); + pDevice->SetTextLineColor(m_pWindow->GetTextLineColor()); + pDevice->SetOverlineColor(m_pWindow->GetOverlineColor()); + pDevice->SetTextFillColor(m_pWindow->GetTextFillColor()); + pDevice->SetTextAlign(m_pWindow->GetTextAlign()); + pDevice->SetRasterOp(m_pWindow->GetRasterOp()); + pDevice->SetRefPoint(m_pWindow->GetRefPoint()); + pDevice->SetLayoutMode(m_pWindow->GetLayoutMode()); + pDevice->SetDigitLanguage(m_pWindow->GetDigitLanguage()); // update the output size now, after all the settings were copied pDevice->SetOutputSize(m_pWindow->GetOutputSize()); @@ -154,7 +165,7 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion) m_pWindow->Paint(*pDevice.get(), m_aPaintRect); // debugging of the areas - show where we are painting - // export VCL_DOUBLEBUFFERING_REGIONS=1 to see where are we + // export VCL_DOUBLEBUFFERING_DEBUG=1 to see where are we // painting if (getenv("VCL_DOUBLEBUFFERING_DEBUG")) { |