diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-06-10 15:01:15 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-06-10 15:50:44 +0200 |
| commit | 342d84218c17da40d0a4f96bc3b07b536d64517a (patch) | |
| tree | 22dfeeea0c1c21559f6ea17bd8c6cc69ec5538e7 /sc | |
| parent | 54253f382e77483b2831af82cf90e2afb0cd55db (diff) | |
sc tiled editing: Mapping has to be turned off after drawing the buttons.
Otherwise the redlines are on wrong positions in the tiled rendering case.
Also - we are actually never call with something else than MAP_PIXEL, so
let's kill the resetting of the mapmode; let's see if some obscure corner case
bites us here.
Change-Id: I8da07dd5448b8863df3148882ec50e6746760cca
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/cctrl/dpcontrol.cxx | 7 | ||||
| -rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx index 90d8783cee6d..f020024a99ac 100644 --- a/sc/source/ui/cctrl/dpcontrol.cxx +++ b/sc/source/ui/cctrl/dpcontrol.cxx @@ -95,11 +95,6 @@ void ScDPFieldButton::setPopupLeft(bool b) void ScDPFieldButton::draw() { - bool bOldMapEnabled = mpOutDev->IsMapModeEnabled(); - - if (mpOutDev->GetMapMode().GetMapUnit() != MAP_PIXEL ) - mpOutDev->EnableMapMode(false); - if (mbBaseButton) { // Background @@ -146,8 +141,6 @@ void ScDPFieldButton::draw() if (mbPopupButton) drawPopupButton(); - - mpOutDev->EnableMapMode(bOldMapEnabled); } void ScDPFieldButton::getPopupBoundingBox(Point& rPos, Size& rSize) const diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index c8f234b84ba2..a5042cdc59da 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -763,6 +763,7 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI aOutputData.DrawStrings(true); // in logic MapMode if bLogicText is set aOutputData.DrawEdit(true); + // the buttons are painted in absolute coordinates if (bIsTiledRendering) { // Tiled offset nScrX, nScrY @@ -777,6 +778,8 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI DrawButtons(nX1, nX2, rTableInfo, pContentDev); // Pixel + pContentDev->SetMapMode(MAP_PIXEL); + aOutputData.DrawClipMarks(); // Szenario / ChangeTracking muss auf jeden Fall nach DrawGrid sein, auch bei !bGridFirst |