diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-06 17:49:35 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-07 10:14:15 +0200 |
commit | 278404a3fae926aeadcf8065b4a5faa07b8c15e2 (patch) | |
tree | 63671116193dfce0e0e14339c949b5244e2cd202 | |
parent | fabf8a4dfebe19abcb5f995c20d8750f95d89a9a (diff) |
tdf#92577 sw rendercontext: paint transparent from controls conditionally
Regression from commit beb4aa21d61f0d66392d596be86fb57b4b167239
(SwViewShell::ImplEndAction: avoid direct paint, 2015-06-29), the
problem was that the lcl_PaintTransparentFormControls() call performs
direct paint, so it should be called only in case we don't do an async
paint via invalidate.
As expected, this call is no longer needed for the original i#107365
bug document in case SwViewShell::Paint() will be called by the main
loop shortly.
Change-Id: Ia27c551ed838d610f972f20abbb4ae9f0e1241b6
(cherry picked from commit 2b26c1796d0a05f47cfb01d79ee4f69344efbbb2)
-rw-r--r-- | sw/source/core/view/viewsh.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 9b96a58ec2b0..a019faeaef83 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -407,8 +407,8 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd ) { InvalidateWindows(aRect.SVRect()); } - - lcl_PaintTransparentFormControls(*this, aRect); // i#107365 + else + lcl_PaintTransparentFormControls(*this, aRect); // i#107365 } pVout.disposeAndClear(); |