diff options
| author | Henry Castro <hcastro@collabora.com> | 2015-05-14 14:53:23 -0400 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-06-10 11:06:25 +0200 |
| commit | 9c947faeae438df99a14e701b12a62b3a250f13d (patch) | |
| tree | 46b8b3cc46828cdcbd3b0ca00deb874b830aa506 /sc | |
| parent | a799d7c9a66464f33bd8ee42d535e29a976d64ae (diff) | |
sc tiled editing: Corrected dropdown button offset
Change-Id: Ieff88d5de119db30c3fbd2f58ba52696eeb3d327
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/cctrl/dpcontrol.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx index e2c34575cc4e..b39a3cf06f69 100644 --- a/sc/source/ui/cctrl/dpcontrol.cxx +++ b/sc/source/ui/cctrl/dpcontrol.cxx @@ -96,7 +96,9 @@ void ScDPFieldButton::setPopupLeft(bool b) void ScDPFieldButton::draw() { bool bOldMapEnablaed = mpOutDev->IsMapModeEnabled(); - mpOutDev->EnableMapMode(false); + + if (mpOutDev->GetMapMode().GetMapUnit() != MAP_PIXEL ) + mpOutDev->EnableMapMode(false); if (mbBaseButton) { diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index b9894c83cd1c..c8f234b84ba2 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -762,7 +762,16 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI if ( bLogicText ) aOutputData.DrawStrings(true); // in logic MapMode if bLogicText is set aOutputData.DrawEdit(true); - pContentDev->SetMapMode(MAP_PIXEL); + + if (bIsTiledRendering) + { + // Tiled offset nScrX, nScrY + MapMode aMap( MAP_PIXEL ); + aMap.SetOrigin(Point(nScrX, nScrY)); + pContentDev->SetMapMode(aMap); + } + else + pContentDev->SetMapMode(MAP_PIXEL); // Autofilter- und Pivot-Buttons |