diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-03 21:13:14 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-04 09:54:24 +0100 |
commit | a89e8c54e8aa95e7f59f204cc3396e2acbdd860a (patch) | |
tree | 19392625a6cc3a24cadd744354cfb0ddebb494bf /vcl | |
parent | bf1932fe2133e5954441be6299e6788c17e1d1b9 (diff) |
remove enum HitTest
since we only care about one of the values, we can just use a bool
Change-Id: Id4fd0c60cd7421861b2e605604b7d3ecbf8bf915
Reviewed-on: https://gerrit.libreoffice.org/64485
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/window/floatwin.cxx | 8 | ||||
-rw-r--r-- | vcl/source/window/winproc.cxx | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 91482016b557..e632f97696b3 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -507,9 +507,10 @@ tools::Rectangle FloatingWindow::ImplConvertToAbsPos(vcl::Window* pReference, co return aFloatRect; } -FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference, const Point& rPos, HitTest& rHitTest ) +FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference, const Point& rPos, bool& rbHitTestInsideRect ) { FloatingWindow* pWin = this; + rbHitTestInsideRect = false; Point aAbsolute(FloatingWindow::ImplConvertToAbsPos(pReference, rPos)); @@ -524,7 +525,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference, const tools::Rectangle devRect( pBorderWin->ImplOutputToUnmirroredAbsoluteScreenPixel( tools::Rectangle( Point(), pBorderWin->GetSizePixel()) ) ) ; if ( devRect.IsInside( aAbsolute ) ) { - rHitTest = HITTEST_WINDOW; + // inside the window return pWin; } @@ -534,7 +535,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference, const // is already in absolute device coordinates if ( pWin->maFloatRect.IsInside( aAbsolute ) ) { - rHitTest = HITTEST_RECT; + rbHitTestInsideRect = true; return pWin; } @@ -542,7 +543,6 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference, const } while ( pWin ); - rHitTest = HITTEST_OUTSIDE; return nullptr; } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index add5c3b45957..a4cce43051c7 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -75,8 +75,8 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& rMousePo * #93895# since floats are system windows, coordinates have * to be converted to float relative for the hittest */ - HitTest nHitTest = HITTEST_OUTSIDE; - FloatingWindow* pFloat = pSVData->maWinData.mpFirstFloat->ImplFloatHitTest( pChild, rMousePos, nHitTest ); + bool bHitTestInsideRect = false; + FloatingWindow* pFloat = pSVData->maWinData.mpFirstFloat->ImplFloatHitTest( pChild, rMousePos, bHitTestInsideRect ); FloatingWindow* pLastLevelFloat; FloatWinPopupFlags nPopupFlags; if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE ) @@ -84,7 +84,7 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& rMousePo if ( bMouseLeave ) return true; - if ( !pFloat || (nHitTest == HITTEST_RECT) ) + if ( !pFloat || bHitTestInsideRect ) { if ( pSVData->maHelpData.mpHelpWin && !pSVData->maHelpData.mbKeyboardHelp ) ImplDestroyHelpWindow( true ); @@ -104,7 +104,7 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& rMousePo pLastLevelFloat->EndPopupMode( FloatWinPopupEndFlags::Cancel | FloatWinPopupEndFlags::CloseAll ); return true; } - else if ( nHitTest == HITTEST_RECT ) + else if ( bHitTestInsideRect ) { pFloat->ImplSetMouseDown(); return true; @@ -114,7 +114,7 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& rMousePo { if ( pFloat ) { - if ( nHitTest == HITTEST_RECT ) + if ( bHitTestInsideRect ) { if ( pFloat->ImplIsMouseDown() ) pFloat->EndPopupMode( FloatWinPopupEndFlags::Cancel ); @@ -1348,8 +1348,8 @@ vcl::Window* HandleGestureEventBase::FindTarget() if (m_pSVData->maWinData.mpFirstFloat && !m_pSVData->maWinData.mpCaptureWin && !m_pSVData->maWinData.mpFirstFloat->ImplIsFloatPopupModeWindow( m_pWindow ) ) { - HitTest nHitTest = HITTEST_OUTSIDE; - pMouseWindow = m_pSVData->maWinData.mpFirstFloat->ImplFloatHitTest( m_pWindow, m_aMousePos, nHitTest ); + bool bHitTestInsideRect = false; + pMouseWindow = m_pSVData->maWinData.mpFirstFloat->ImplFloatHitTest( m_pWindow, m_aMousePos, bHitTestInsideRect ); if (!pMouseWindow) pMouseWindow = m_pSVData->maWinData.mpFirstFloat; } |