summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-04-12 14:53:20 +0100
committerAndras Timar <andras.timar@collabora.com>2018-05-16 15:17:52 +0200
commit29e9802dcf9318394e2aff747396ff99408270cd (patch)
tree211ff17419a24a2449831cef0c34d562455c6c41 /sc
parent1c7eeb124ce82bb6f90c54ed7eade9d050aae45e (diff)
Related: tdf#100925 background not getting set under X sometimes
not sure why this is the case, but it is reminiscent of rhbz#1283420 which results in missing glyphs in some circumstances X11CairoTextRender::getCairoContext has a hack in it for that problem, whic forces a read from the underlying X Drawable before writing to it which seems to have the effect of syncing it up. So, just before drawing the bg, draw a glyph on it to get it synced, and then overwrite it. Reviewed-on: https://gerrit.libreoffice.org/52819 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit e8080c79043a7d9036f27cc24b76b7ff21c58da8) Change-Id: I2ffff7e8e989b91821869d8b75a59728ac513d1b
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/view/gridwin4.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 13b82122d6fd..c90407bb2b83 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1047,7 +1047,12 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
}
// paint the background
- rDevice.DrawRect(rDevice.PixelToLogic(aBackground));
+ Rectangle aLogicRect(rDevice.PixelToLogic(aBackground));
+ //tdf#100925, rhbz#1283420, Draw some text here, to get
+ //X11CairoTextRender::getCairoContext called, so that the forced read
+ //from the underlying X Drawable gets it to sync.
+ rDevice.DrawText(aLogicRect.BottomLeft(), " ");
+ rDevice.DrawRect(aLogicRect);
// paint the editeng text
Rectangle aEditRect(Point(nScrX, nScrY), Size(aOutputData.GetScrW(), aOutputData.GetScrH()));