diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-09-17 21:49:21 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-09-20 12:10:44 +0200 |
| commit | b22d4785310eac35696df771803dfba0871a50ac (patch) | |
| tree | 56e394a3c38a2e1f17530fbc18dd8e6b3c5d5098 /toolkit | |
| parent | 3e2370260f2b79c43b4f8a86b123861aa95d3ef2 (diff) | |
clean up ambiguous confusing rectangle APIs like IsInside()
Reading 'rectA.IsInside( rectB )' kind of suggests that the code
checks whether 'rectA is inside rectB', but it's actually the other
way around. Rename IsInside() -> Contains(), IsOver() -> Overlaps(),
which should make it clear which way the logic goes.
Change-Id: I9347450fe7dc34c96df6d636a4e3e660de1801ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122271
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxaccessiblecomponent.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/hatchwindow/ipwin.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index 101307bf1d96..b13eeb1ade52 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -667,7 +667,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi { tools::Rectangle aRect = VCLRectangle( xComp->getBounds() ); Point aPos = VCLPoint( rPoint ); - if ( aRect.IsInside( aPos ) ) + if ( aRect.Contains( aPos ) ) { xChild = xAcc; break; diff --git a/toolkit/source/hatchwindow/ipwin.cxx b/toolkit/source/hatchwindow/ipwin.cxx index b21a3271e3e5..227d0a661aa2 100644 --- a/toolkit/source/hatchwindow/ipwin.cxx +++ b/toolkit/source/hatchwindow/ipwin.cxx @@ -179,12 +179,12 @@ short SvResizeHelper::SelectMove( vcl::Window * pWin, const Point & rPos ) { std::array<tools::Rectangle,8> aRects = FillHandleRectsPixel(); for( sal_uInt16 i = 0; i < 8; i++ ) - if( aRects[ i ].IsInside( rPos ) ) + if( aRects[ i ].Contains( rPos ) ) return i; // Move-Rect overlaps Handles std::array<tools::Rectangle,4> aMoveRects = FillMoveRectsPixel(); for(const auto & rMoveRect : aMoveRects) - if( rMoveRect.IsInside( rPos ) ) + if( rMoveRect.Contains( rPos ) ) return 8; } else |