summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-04-12 14:53:20 +0100
committerEike Rathke <erack@redhat.com>2018-04-13 17:09:20 +0200
commitccb90e3266336d6b022c48ec90cd55450c9c209e (patch)
tree3f97c7cf27ee2efaacb35df1f6c37b45795d757e
parent14b042d86e5d3e20dbc73efe08b831810bd52711 (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. Change-Id: I2ffff7e8e989b91821869d8b75a59728ac513d1b Reviewed-on: https://gerrit.libreoffice.org/52818 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
-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 92b0eee6cc96..83d4e18ce8cd 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1021,7 +1021,12 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
}
// paint the background
- rDevice.DrawRect(rDevice.PixelToLogic(aBackground));
+ tools::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
tools::Rectangle aEditRect(Point(nScrX, nScrY), Size(aOutputData.GetScrW(), aOutputData.GetScrH()));