diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2022-04-01 13:20:02 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2022-04-04 11:22:46 +0200 |
| commit | 788599c7df58546900874ff0443be8522f9b4a04 (patch) | |
| tree | a50ffbc01fa286348e43c1ba2b76a8b9f650dbd2 | |
| parent | a72542df1d15aaac4c8a4772650130fd826a564c (diff) | |
lok: fix formulabar rendering
While forwardporting it was not taken into account that
no pixel/logic conversion is needed.
regression in:
commit cf5b0d5972b02809e9b7f35780885445242b3f12
Author: Szymon Kłos <szymon.klos@collabora.com>
Date: Mon Jan 17 13:11:19 2022 +0100
RTL: lok: render correctly interim windows
Change-Id: Ic6716bf9335d4a9297e3e5edfeb161702b846efb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132424
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/paint.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 9eb7ff7fe665..9f40b770ffbb 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -1351,7 +1351,7 @@ void SalInstanceWidget::DoRecursivePaint(vcl::Window* pWindow, const Point& rRen = pChild->GetOutDev()->GetOutOffYPixel() - pWindow->GetOutDev()->GetOutOffYPixel(); Point aPos(rRenderLogicPos); - aPos += rOutput.PixelToLogic(Point(nDeltaX, nDeltaY)); + aPos += Point(nDeltaX, nDeltaY); DoRecursivePaint(pChild, aPos, rOutput); } diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 49fd65f8c5fe..40172ade6a9e 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -1421,7 +1421,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP if( bHasMirroredGraphics ) nDeltaX = GetOutDev()->mnOutWidth - nDeltaX - pChild->GetOutDev()->mnOutWidth; - tools::Long nDeltaY = pChild->GetOutDev()->mnOutOffY - GetOutDev()->mnOutOffY; + tools::Long nDeltaY = pChild->GetOutOffYPixel() - GetOutOffYPixel(); Point aPos( i_rPos ); aPos += Point(nDeltaX, nDeltaY); |