summaryrefslogtreecommitdiff
path: root/vcl/source/window/window2.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2023-07-18 16:28:17 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2023-07-18 19:10:29 +0200
commit8fc4c3504947d0e5c34978cb8ae9bdd2a2196fd1 (patch)
tree0c4d4c76627b230e6e026adfc7e7319467ee117c /vcl/source/window/window2.cxx
parentdf00cd5cf77eb2322f53b80296862940ba815d9a (diff)
remove ImplFrameToOutput and ImplOutputToFrame
in favour of ScreenToOutputPixel and OutputToScreenPixel, since their implementation is exactly the same Change-Id: Iede024bfc5654e3f671984620f8e88d2414003f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154591 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/window/window2.cxx')
-rw-r--r--vcl/source/window/window2.cxx14
1 files changed, 2 insertions, 12 deletions
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 46d8bd7f8881..5e9ffd2ef529 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -235,7 +235,7 @@ IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer, void )
const OutputDevice *pOutDev = GetOutDev();
pOutDev->ReMirror( aMousePos );
}
- MouseEvent aMEvt( ImplFrameToOutput( aMousePos ),
+ MouseEvent aMEvt( ScreenToOutputPixel( aMousePos ),
mpWindowImpl->mpFrameData->mnClickCount, MouseEventModifiers::NONE,
mpWindowImpl->mpFrameData->mnMouseCode,
mpWindowImpl->mpFrameData->mnMouseCode );
@@ -321,7 +321,7 @@ void Window::EndTracking( TrackingEventFlags nFlags )
pOutDev->ReMirror( aMousePos );
}
- MouseEvent aMEvt( ImplFrameToOutput( aMousePos ),
+ MouseEvent aMEvt( ScreenToOutputPixel( aMousePos ),
mpWindowImpl->mpFrameData->mnClickCount, MouseEventModifiers::NONE,
mpWindowImpl->mpFrameData->mnMouseCode,
mpWindowImpl->mpFrameData->mnMouseCode );
@@ -970,16 +970,6 @@ void Window::ImplSetMouseTransparent( bool bTransparent )
mpWindowImpl->mbMouseTransparent = bTransparent;
}
-Point Window::ImplOutputToFrame( const Point& rPos )
-{
- return Point( rPos.X()+GetOutDev()->mnOutOffX, rPos.Y()+GetOutDev()->mnOutOffY );
-}
-
-Point Window::ImplFrameToOutput( const Point& rPos )
-{
- return Point( rPos.X()-GetOutDev()->mnOutOffX, rPos.Y()-GetOutDev()->mnOutOffY );
-}
-
void Window::SetCompoundControl( bool bCompound )
{
if (mpWindowImpl)