diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-17 17:07:47 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-17 17:40:22 +0100 |
| commit | c9db32de2deeaa705e3da4945f62a94b75a7e4c5 (patch) | |
| tree | a79cf0e75ca0e901c193d0290cc4ad8304504efd /sw | |
| parent | c2d7b58662951c5d482e882ae730e532988d2ea3 (diff) | |
sw lok comments: fix comment widget width with custom zoom
When tiled rendering, then only the render context (or failing that,
SwViewShell::GetOut()) has the correct zoom level, so use that when
doing pixel-to-logic conversion or scaling pixel values.
Change-Id: I265a642b8253c6eced42da2a0e06a2de25c36ca8
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/docvw/PostItMgr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/SidebarWin.cxx | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index b18cff52beb2..e994b3dbac76 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -870,7 +870,7 @@ void SwPostItMgr::PaintTile(OutputDevice& rRenderContext, const Rectangle& /*rRe MapMode aMapMode(rRenderContext.GetMapMode()); aMapMode.SetOrigin(aMapMode.GetOrigin() + aOffset); rRenderContext.SetMapMode(aMapMode); - Size aSize(pPostIt->PixelToLogic(pPostIt->GetSizePixel())); + Size aSize(rRenderContext.PixelToLogic(pPostIt->GetSizePixel())); Rectangle aRectangle(Point(0, 0), aSize); pPostIt->PaintTile(rRenderContext, aRectangle); diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 99f4c39ace14..145033d91008 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -285,7 +285,8 @@ void SwSidebarWin::PaintTile(vcl::RenderContext& rRenderContext, const Rectangle continue; rRenderContext.Push(PushFlags::MAPMODE); - Point aOffset(PixelToLogic(pChild->GetPosPixel())); + const Fraction& rFraction(mrView.GetWrtShellPtr()->GetOut()->GetMapMode().GetScaleY()); + Point aOffset(PixelToLogic(pChild->GetPosPixel() * rFraction.GetDenominator() / rFraction.GetNumerator())); MapMode aMapMode(rRenderContext.GetMapMode()); aMapMode.SetOrigin(aMapMode.GetOrigin() + aOffset); rRenderContext.SetMapMode(aMapMode); @@ -1402,7 +1403,7 @@ sal_Int32 SwSidebarWin::GetMetaButtonAreaWidth() sal_Int32 SwSidebarWin::GetMetaHeight() { - const Fraction& f( GetMapMode().GetScaleY() ); + const Fraction& f(mrView.GetWrtShellPtr()->GetOut()->GetMapMode().GetScaleY()); return POSTIT_META_HEIGHT * f.GetNumerator() / f.GetDenominator(); } @@ -1413,7 +1414,7 @@ sal_Int32 SwSidebarWin::GetMinimumSizeWithMeta() sal_Int32 SwSidebarWin::GetMinimumSizeWithoutMeta() { - const Fraction& f( GetMapMode().GetScaleY() ); + const Fraction& f(mrView.GetWrtShellPtr()->GetOut()->GetMapMode().GetScaleY()); return POSTIT_MINIMUMSIZE_WITHOUT_META * f.GetNumerator() / f.GetDenominator(); } |