diff options
Diffstat (limited to 'vcl')
42 files changed, 164 insertions, 164 deletions
diff --git a/vcl/inc/regband.hxx b/vcl/inc/regband.hxx index f92976c8a569..b0135fa56086 100644 --- a/vcl/inc/regband.hxx +++ b/vcl/inc/regband.hxx @@ -106,7 +106,7 @@ public: void MoveX( tools::Long nHorzMove ); void ScaleX( double fHorzScale ); - bool IsInside( tools::Long nX ); + bool Contains( tools::Long nX ); bool IsEmpty() const { return ((!mpFirstSep) && (!mpFirstBandPoint)); } diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx index b722be430e6a..c25b5dd648eb 100644 --- a/vcl/inc/regionband.hxx +++ b/vcl/inc/regionband.hxx @@ -72,7 +72,7 @@ public: bool Exclude(const RegionBand& rSource); void XOr(const RegionBand& rSource); tools::Rectangle GetBoundRect() const; - bool IsInside(const Point& rPoint) const; + bool Contains(const Point& rPoint) const; sal_uInt32 getRectangleCount() const; // only users are Region::Intersect, Region::IsRectangle and PSWriter::ImplBmp void GetRegionRectangles(RectangleVector& rTarget) const; diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx index 282a26ca0c60..328cf9c94eca 100644 --- a/vcl/osx/salnativewidgets.cxx +++ b/vcl/osx/salnativewidgets.cxx @@ -220,7 +220,7 @@ bool AquaSalGraphics::hitTestNativeControl(ControlType nType, ControlPart nPart, tools::Rectangle aRect; bool bValid = AquaGetScrollRect(/* TODO: int nScreen, */ nPart, rControlRegion, aRect); - rIsInside = bValid && aRect.IsInside(rPos); + rIsInside = bValid && aRect.Contains(rPos); return bValid; } return false; diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index c77bf57e1bd4..f1dddeb0e616 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -656,7 +656,7 @@ void ImplSetHelpWindowPos( vcl::Window* pHelpWin, sal_uInt16 nHelpWinStyle, Quic // otherwise it would directly be closed due to a focus change... */ tools::Rectangle aHelpRect( aPos, aSz ); - if( aHelpRect.IsInside( aMousePos ) ) + if( aHelpRect.Contains( aMousePos ) ) { Point delta(2,2); Point aSize( aSz.Width(), aSz.Height() ); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index af0353043f51..66c030dd5501 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1302,7 +1302,7 @@ unsigned int Application::GetBestScreen( const tools::Rectangle& i_rRect ) { const tools::Rectangle aCurScreenRect( GetScreenPosSizePixel( i ) ); // if a screen contains the rectangle completely it is obviously the best screen - if( aCurScreenRect.IsInside( i_rRect ) ) + if( aCurScreenRect.Contains( i_rRect ) ) return i; // next the screen which contains most of the area of the rect is the best tools::Rectangle aIntersection( aCurScreenRect.GetIntersection( i_rRect ) ); diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index cb7581b35c76..87e128b819e2 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -744,7 +744,7 @@ bool PushButton::ImplHitTestPushButton( vcl::Window const * pDev, { tools::Rectangle aTestRect( Point(), pDev->GetOutputSizePixel() ); - return aTestRect.IsInside( rPos ); + return aTestRect.Contains( rPos ); } DrawTextFlags PushButton::ImplGetTextStyle( SystemTextColorFlags nSystemTextColorFlags ) const @@ -987,10 +987,10 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext) if (Window::IsEnabled()) nState |= ControlState::ENABLED; - if (IsMouseOver() && aInRect.IsInside(GetPointerPosPixel())) + if (IsMouseOver() && aInRect.Contains(GetPointerPosPixel())) nState |= ControlState::ROLLOVER; - if ( IsMouseOver() && aInRect.IsInside(GetPointerPosPixel()) && mbIsActive) + if ( IsMouseOver() && aInRect.Contains(GetPointerPosPixel()) && mbIsActive) { nState |= ControlState::ROLLOVER; nButtonStyle &= ~DrawButtonFlags::Pressed; @@ -1005,7 +1005,7 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext) if (bNativeOK) return; - bool bRollOver = (IsMouseOver() && aInRect.IsInside(GetPointerPosPixel())); + bool bRollOver = (IsMouseOver() && aInRect.Contains(GetPointerPosPixel())); if (bRollOver) nButtonStyle |= DrawButtonFlags::Highlight; bool bDrawMenuSep = mnDDStyle == PushButtonDropdownStyle::SplitMenuButton; @@ -1932,7 +1932,7 @@ void RadioButton::ImplDrawRadioButtonState(vcl::RenderContext& rRenderContext) if (IsEnabled()) nState |= ControlState::ENABLED; - if (IsMouseOver() && maMouseRect.IsInside(GetPointerPosPixel())) + if (IsMouseOver() && maMouseRect.Contains(GetPointerPosPixel())) nState |= ControlState::ROLLOVER; bNativeOK = rRenderContext.DrawNativeControl(ControlType::Radiobutton, ControlPart::Entire, aCtrlRect, @@ -2346,7 +2346,7 @@ void RadioButton::dispose() void RadioButton::MouseButtonDown( const MouseEvent& rMEvt ) { - if ( rMEvt.IsLeft() && maMouseRect.IsInside( rMEvt.GetPosPixel() ) ) + if ( rMEvt.IsLeft() && maMouseRect.Contains( rMEvt.GetPosPixel() ) ) { GetButtonState() |= DrawButtonFlags::Pressed; Invalidate(); @@ -2379,7 +2379,7 @@ void RadioButton::Tracking( const TrackingEvent& rTEvt ) } else { - if ( maMouseRect.IsInside( rTEvt.GetMouseEvent().GetPosPixel() ) ) + if ( maMouseRect.Contains( rTEvt.GetMouseEvent().GetPosPixel() ) ) { if ( !(GetButtonState() & DrawButtonFlags::Pressed) ) { @@ -2612,7 +2612,7 @@ bool RadioButton::PreNotify( NotifyEvent& rNEvt ) // trigger redraw if mouse over state has changed if( IsNativeControlSupported(ControlType::Radiobutton, ControlPart::Entire) ) { - if (maMouseRect.IsInside(GetPointerPosPixel()) != maMouseRect.IsInside(GetLastPointerPosPixel()) || + if (maMouseRect.Contains(GetPointerPosPixel()) != maMouseRect.Contains(GetLastPointerPosPixel()) || pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow()) { Invalidate( maStateRect ); @@ -3061,7 +3061,7 @@ void CheckBox::ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) else if (meState == TRISTATE_INDET) aControlValue.setTristateVal(ButtonValue::Mixed); - if (IsMouseOver() && maMouseRect.IsInside(GetPointerPosPixel())) + if (IsMouseOver() && maMouseRect.Contains(GetPointerPosPixel())) nState |= ControlState::ROLLOVER; bNativeOK = rRenderContext.DrawNativeControl(ControlType::Checkbox, ControlPart::Entire, aCtrlRegion, @@ -3172,7 +3172,7 @@ CheckBox::CheckBox( vcl::Window* pParent, WinBits nStyle ) : void CheckBox::MouseButtonDown( const MouseEvent& rMEvt ) { - if ( rMEvt.IsLeft() && maMouseRect.IsInside( rMEvt.GetPosPixel() ) ) + if ( rMEvt.IsLeft() && maMouseRect.Contains( rMEvt.GetPosPixel() ) ) { GetButtonState() |= DrawButtonFlags::Pressed; Invalidate(); @@ -3205,7 +3205,7 @@ void CheckBox::Tracking( const TrackingEvent& rTEvt ) } else { - if ( maMouseRect.IsInside( rTEvt.GetMouseEvent().GetPosPixel() ) ) + if ( maMouseRect.Contains( rTEvt.GetMouseEvent().GetPosPixel() ) ) { if ( !(GetButtonState() & DrawButtonFlags::Pressed) ) { @@ -3493,7 +3493,7 @@ bool CheckBox::PreNotify( NotifyEvent& rNEvt ) // trigger redraw if mouse over state has changed if( IsNativeControlSupported(ControlType::Checkbox, ControlPart::Entire) ) { - if (maMouseRect.IsInside(GetPointerPosPixel()) != maMouseRect.IsInside(GetLastPointerPosPixel()) || + if (maMouseRect.Contains(GetPointerPosPixel()) != maMouseRect.Contains(GetLastPointerPosPixel()) || pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow()) { Invalidate( maStateRect ); diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx index ba69a780b6ea..4beea72b5e83 100644 --- a/vcl/source/control/calendar.cxx +++ b/vcl/source/control/calendar.cxx @@ -331,9 +331,9 @@ sal_uInt16 Calendar::ImplDoHitTest( const Point& rPos, Date& rDate ) const if ( mbFormat ) return 0; - if ( maPrevRect.IsInside( rPos ) ) + if ( maPrevRect.Contains( rPos ) ) return CALENDAR_HITTEST_PREV; - else if ( maNextRect.IsInside( rPos ) ) + else if ( maNextRect.Contains( rPos ) ) return CALENDAR_HITTEST_NEXT; tools::Long nY; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 05d898655c95..15ff238f32e8 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -1343,7 +1343,7 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt ) ImplSetSelection( Selection( aBoundary.startPos, aBoundary.endPos ) ); ImplCopyToSelectionClipboard(); } - else if ( !rMEvt.IsShift() && HasFocus() && aSelection.IsInside( nCharPos ) ) + else if ( !rMEvt.IsShift() && HasFocus() && aSelection.Contains( nCharPos ) ) mbClickedInSelection = true; else if ( rMEvt.IsLeft() ) ImplSetCursorPos( nCharPos, rMEvt.IsShift() ); @@ -2872,7 +2872,7 @@ void Edit::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) aSel.Justify(); // Don't accept drop in selection or read-only field... - if ( IsReadOnly() || aSel.IsInside( mpDDInfo->nDropPos ) || ! mpDDInfo->bIsStringSupported ) + if ( IsReadOnly() || aSel.Contains( mpDDInfo->nDropPos ) || ! mpDDInfo->bIsStringSupported ) { ImplHideDDCursor(); rDTDE.Context->rejectDrag(); diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx index 0e828a941662..691278f73b9b 100644 --- a/vcl/source/control/imivctl1.cxx +++ b/vcl/source/control/imivctl1.cxx @@ -217,7 +217,7 @@ void SvxIconChoiceCtrl_Impl::InsertEntry( std::unique_ptr<SvxIconChoiceCtrlEntry FindBoundingRect( pEntry ); tools::Rectangle aOutputArea( GetOutputRect() ); pGridMap->OccupyGrids( pEntry ); - if( !aOutputArea.IsOver( pEntry->aRect ) ) + if( !aOutputArea.Overlaps( pEntry->aRect ) ) return; // is invisible pView->Invalidate( pEntry->aRect ); } @@ -556,7 +556,7 @@ void SvxIconChoiceCtrl_Impl::Paint(vcl::RenderContext& rRenderContext, const too { SvxIconChoiceCtrlEntry* pEntry = maZOrderList[nPos]; const tools::Rectangle& rBoundRect = GetEntryBoundRect(pEntry); - if (rRect.IsOver(rBoundRect)) + if (rRect.Overlaps(rBoundRect)) { PaintEntry(pEntry, rBoundRect.TopLeft(), rRenderContext); // set entries to Top if they are being repainted @@ -587,7 +587,7 @@ void SvxIconChoiceCtrl_Impl::RepaintSelectedEntries() if (pEntry->GetFlags() & SvxIconViewFlags::SELECTED) { const tools::Rectangle& rBoundRect = GetEntryBoundRect(pEntry); - if (aOutRect.IsOver(rBoundRect)) + if (aOutRect.Overlaps(rBoundRect)) pView->Invalidate(rBoundRect); } } @@ -1438,7 +1438,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po if (!rRenderContext.IsClipRegion() && (aVerSBar->IsVisible() || aHorSBar->IsVisible())) { tools::Rectangle aOutputArea(GetOutputRect()); - if (aOutputArea.IsOver(aTextRect) || aOutputArea.IsOver(aBmpRect)) + if (aOutputArea.Overlaps(aTextRect) || aOutputArea.Overlaps(aBmpRect)) { rRenderContext.SetClipRegion(vcl::Region(aOutputArea)); bResetClipRegion = true; @@ -1526,7 +1526,7 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetEntry( const Point& rDocPos, { nCount--; SvxIconChoiceCtrlEntry* pEntry = maZOrderList[ nCount ]; - if( pEntry->aRect.IsInside( rDocPos ) ) + if( pEntry->aRect.Contains( rDocPos ) ) { if( bHit ) { @@ -1535,10 +1535,10 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetEntry( const Point& rDocPos, aRect.AdjustBottom(3 ); aRect.AdjustLeft( -3 ); aRect.AdjustRight(3 ); - if( aRect.IsInside( rDocPos ) ) + if( aRect.Contains( rDocPos ) ) return pEntry; aRect = CalcTextRect( pEntry ); - if( aRect.IsInside( rDocPos ) ) + if( aRect.Contains( rDocPos ) ) return pEntry; } else @@ -1816,7 +1816,7 @@ bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd ) { tools::Rectangle aDocRect( Point(), aVirtOutputSize ); tools::Rectangle aVisRect( GetOutputRect() ); - if( aVisRect.IsInside( aDocRect )) + if( aVisRect.Contains( aDocRect )) return false; Size aDocSize( aDocRect.GetSize() ); Size aVisSize( aVisRect.GetSize() ); @@ -1940,7 +1940,7 @@ void SvxIconChoiceCtrl_Impl::MakeVisible( const tools::Rectangle& rRect, bool bS // convert to document coordinate aOrigin *= -1; tools::Rectangle aOutputArea( GetOutputRect() ); - if( aOutputArea.IsInside( aVirtRect ) ) + if( aOutputArea.Contains( aVirtRect ) ) return; // is already visible tools::Long nDy; @@ -2280,7 +2280,7 @@ void SvxIconChoiceCtrl_Impl::SelectRect( const tools::Rectangle& rRect, bool bAd bOverlaps = IsOver( pOtherRects, aBoundRect ); else bOverlaps = false; - bool bOver = aRect.IsOver( aBoundRect ); + bool bOver = aRect.Overlaps( aBoundRect ); if( bOver && !bOverlaps ) { @@ -2309,7 +2309,7 @@ void SvxIconChoiceCtrl_Impl::SelectRect( const tools::Rectangle& rRect, bool bAd // the intersection. // Possible solution: remember a snapshot of the selection before // spanning the rectangle. - if( aBoundRect.IsOver( rRect)) + if( aBoundRect.Overlaps( rRect)) { // deselect intersection between old rectangles and current rectangle if( bSelected ) @@ -2389,7 +2389,7 @@ bool SvxIconChoiceCtrl_Impl::IsOver( std::vector<tools::Rectangle>* pRectList, c for( sal_uInt16 nCur = 0; nCur < nCount; nCur++ ) { tools::Rectangle& rRect = (*pRectList)[ nCur ]; - if( rBoundRect.IsOver( rRect )) + if( rBoundRect.Overlaps( rRect )) return true; } return false; @@ -2786,7 +2786,7 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt ) OUString sQuickHelpText = pEntry->GetQuickHelpText(); OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry ) ); tools::Rectangle aTextRect( CalcTextRect( pEntry, nullptr, &aEntryText ) ); - if ( ( !aTextRect.IsInside( aPos ) || aEntryText.isEmpty() ) && sQuickHelpText.isEmpty() ) + if ( ( !aTextRect.Contains( aPos ) || aEntryText.isEmpty() ) && sQuickHelpText.isEmpty() ) return false; tools::Rectangle aOptTextRect( aTextRect ); diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx index a607aa84a45f..a1bcceaf26cb 100644 --- a/vcl/source/control/imp_listbox.cxx +++ b/vcl/source/control/imp_listbox.cxx @@ -880,7 +880,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt ) return; tools::Rectangle aRect( Point(), GetOutputSizePixel() ); - if( !aRect.IsInside( rMEvt.GetPosPixel() ) ) + if( !aRect.Contains( rMEvt.GetPosPixel() ) ) return; if ( IsMouseMoveSelect() ) @@ -1121,7 +1121,7 @@ bool ImplListBoxWindow::SelectEntries( sal_Int32 nSelect, LB_EVENT_TYPE eLET, bo void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) { tools::Rectangle aRect( Point(), GetOutputSizePixel() ); - bool bInside = aRect.IsInside( rTEvt.GetMouseEvent().GetPosPixel() ); + bool bInside = aRect.Contains( rTEvt.GetMouseEvent().GetPosPixel() ); if( rTEvt.IsTrackingCanceled() || rTEvt.IsTrackingEnded() ) // MouseButtonUp { diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index d929ec00ba9a..e1e92b236f21 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -731,7 +731,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) if ( GetOutDev()->HitTestNativeScrollbar( bHorizontal? (IsRTLEnabled()? ControlPart::ButtonRight: ControlPart::ButtonLeft): ControlPart::ButtonUp, aControlRegion, rMousePos, bIsInside )? bIsInside: - maBtn1Rect.IsInside( rMousePos ) ) + maBtn1Rect.Contains( rMousePos ) ) { bAction = bCallAction; mnStateFlags |= SCRBAR_STATE_BTN1_DOWN; @@ -744,7 +744,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) if ( GetOutDev()->HitTestNativeScrollbar( bHorizontal? (IsRTLEnabled()? ControlPart::ButtonLeft: ControlPart::ButtonRight): ControlPart::ButtonDown, aControlRegion, rMousePos, bIsInside )? bIsInside: - maBtn2Rect.IsInside( rMousePos ) ) + maBtn2Rect.Contains( rMousePos ) ) { bAction = bCallAction; mnStateFlags |= SCRBAR_STATE_BTN2_DOWN; @@ -758,7 +758,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) if ( GetOutDev()->HitTestNativeScrollbar( bHorizontal? ControlPart::TrackHorzLeft: ControlPart::TrackVertUpper, maPage1Rect, rMousePos, bIsInside )? bIsInside: - maPage1Rect.IsInside( rMousePos ) ) + maPage1Rect.Contains( rMousePos ) ) { bAction = bCallAction; mnStateFlags |= SCRBAR_STATE_PAGE1_DOWN; @@ -772,7 +772,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) if ( GetOutDev()->HitTestNativeScrollbar( bHorizontal? ControlPart::TrackHorzRight: ControlPart::TrackVertLower, maPage2Rect, rMousePos, bIsInside )? bIsInside: - maPage2Rect.IsInside( rMousePos ) ) + maPage2Rect.Contains( rMousePos ) ) { bAction = bCallAction; mnStateFlags |= SCRBAR_STATE_PAGE2_DOWN; @@ -863,7 +863,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) if ( GetOutDev()->HitTestNativeScrollbar( bHorizontal? (IsRTLEnabled()? ControlPart::ButtonRight: ControlPart::ButtonLeft): ControlPart::ButtonUp, aControlRegion, rMousePos, bIsInside )? bIsInside: - maBtn1Rect.IsInside( rMousePos ) ) + maBtn1Rect.Contains( rMousePos ) ) { if (rMEvt.IsLeft() && !(mnStateFlags & SCRBAR_STATE_BTN1_DISABLE) ) { @@ -874,7 +874,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) else if ( GetOutDev()->HitTestNativeScrollbar( bHorizontal? (IsRTLEnabled()? ControlPart::ButtonLeft: ControlPart::ButtonRight): ControlPart::ButtonDown, aControlRegion, rMousePos, bIsInside )? bIsInside: - maBtn2Rect.IsInside( rMousePos ) ) + maBtn2Rect.Contains( rMousePos ) ) { if (rMEvt.IsLeft() && !(mnStateFlags & SCRBAR_STATE_BTN2_DISABLE) ) { @@ -886,7 +886,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) { bool bThumbHit = GetOutDev()->HitTestNativeScrollbar( bHorizontal? ControlPart::ThumbHorz : ControlPart::ThumbVert, maThumbRect, rMousePos, bIsInside ) - ? bIsInside : maThumbRect.IsInside( rMousePos ); + ? bIsInside : maThumbRect.Contains( rMousePos ); bool bThumbAction = bWarp || bPage; @@ -939,7 +939,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) if ( GetOutDev()->HitTestNativeScrollbar( bHorizontal? ControlPart::TrackHorzLeft : ControlPart::TrackVertUpper, maPage1Rect, rMousePos, bIsInside )? bIsInside: - maPage1Rect.IsInside( rMousePos ) ) + maPage1Rect.Contains( rMousePos ) ) { meScrollType = ScrollType::PageUp; } @@ -1220,30 +1220,30 @@ tools::Rectangle* ScrollBar::ImplFindPartRect( const Point& rPt ) if( GetOutDev()->HitTestNativeScrollbar( bHorizontal? (IsRTLEnabled()? ControlPart::ButtonRight: ControlPart::ButtonLeft): ControlPart::ButtonUp, aControlRegion, rPt, bIsInside )? bIsInside: - maBtn1Rect.IsInside( rPt ) ) + maBtn1Rect.Contains( rPt ) ) return &maBtn1Rect; else if( GetOutDev()->HitTestNativeScrollbar( bHorizontal? (IsRTLEnabled()? ControlPart::ButtonLeft: ControlPart::ButtonRight): ControlPart::ButtonDown, aControlRegion, rPt, bIsInside )? bIsInside: - maBtn2Rect.IsInside( rPt ) ) + maBtn2Rect.Contains( rPt ) ) return &maBtn2Rect; // HitTestNativeScrollbar, see remark at top of file else if( GetOutDev()->HitTestNativeScrollbar( bHorizontal ? ControlPart::TrackHorzLeft : ControlPart::TrackVertUpper, maPage1Rect, rPt, bIsInside)? bIsInside: - maPage1Rect.IsInside( rPt ) ) + maPage1Rect.Contains( rPt ) ) return &maPage1Rect; // HitTestNativeScrollbar, see remark at top of file else if( GetOutDev()->HitTestNativeScrollbar( bHorizontal ? ControlPart::TrackHorzRight : ControlPart::TrackVertLower, maPage2Rect, rPt, bIsInside)? bIsInside: - maPage2Rect.IsInside( rPt ) ) + maPage2Rect.Contains( rPt ) ) return &maPage2Rect; // HitTestNativeScrollbar, see remark at top of file else if( GetOutDev()->HitTestNativeScrollbar( bHorizontal ? ControlPart::ThumbHorz : ControlPart::ThumbVert, maThumbRect, rPt, bIsInside)? bIsInside: - maThumbRect.IsInside( rPt ) ) + maThumbRect.Contains( rPt ) ) return &maThumbRect; else return nullptr; diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index af259cd184e7..3ec5bdb949ae 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -344,7 +344,7 @@ void Slider::ImplDraw(vcl::RenderContext& rRenderContext) if (IsMouseOver()) { - if (maThumbRect.IsInside(GetPointerPosPixel())) + if (maThumbRect.Contains(GetPointerPosPixel())) aSliderValue.mnThumbState |= ControlState::ROLLOVER; } @@ -475,7 +475,7 @@ bool Slider::ImplIsPageUp( const Point& rPos ) aRect.SetLeft( 0 ); aRect.SetRight( aSize.Width()-1 ); } - return aRect.IsInside( rPos ); + return aRect.Contains( rPos ); } bool Slider::ImplIsPageDown( const Point& rPos ) @@ -492,7 +492,7 @@ bool Slider::ImplIsPageDown( const Point& rPos ) aRect.SetLeft( 0 ); aRect.SetRight( aSize.Width()-1 ); } - return aRect.IsInside( rPos ); + return aRect.Contains( rPos ); } tools::Long Slider::ImplSlide( tools::Long nNewPos ) @@ -609,7 +609,7 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt ) const Point& rMousePos = rMEvt.GetPosPixel(); StartTrackingFlags nTrackFlags = StartTrackingFlags::NONE; - if ( maThumbRect.IsInside( rMousePos ) ) + if ( maThumbRect.Contains( rMousePos ) ) { meScrollType = ScrollType::Drag; diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index f99bf61393fb..084fc570a739 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -178,13 +178,13 @@ void SpinButton::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangl void SpinButton::MouseButtonDown( const MouseEvent& rMEvt ) { - if ( maUpperRect.IsInside( rMEvt.GetPosPixel() ) && ( ImplIsUpperEnabled() ) ) + if ( maUpperRect.Contains( rMEvt.GetPosPixel() ) && ( ImplIsUpperEnabled() ) ) { mbUpperIn = true; mbInitialUp = true; Invalidate( maUpperRect ); } - else if ( maLowerRect.IsInside( rMEvt.GetPosPixel() ) && ( ImplIsLowerEnabled() ) ) + else if ( maLowerRect.Contains( rMEvt.GetPosPixel() ) && ( ImplIsLowerEnabled() ) ) { mbLowerIn = true; mbInitialDown = true; @@ -229,21 +229,21 @@ void SpinButton::MouseMove( const MouseEvent& rMEvt ) if ( !rMEvt.IsLeft() || (!mbInitialUp && !mbInitialDown) ) return; - if ( !maUpperRect.IsInside( rMEvt.GetPosPixel() ) && + if ( !maUpperRect.Contains( rMEvt.GetPosPixel() ) && mbUpperIn && mbInitialUp ) { mbUpperIn = false; maRepeatTimer.Stop(); Invalidate( maUpperRect ); } - else if ( !maLowerRect.IsInside( rMEvt.GetPosPixel() ) && + else if ( !maLowerRect.Contains( rMEvt.GetPosPixel() ) && mbLowerIn && mbInitialDown ) { mbLowerIn = false; maRepeatTimer.Stop(); Invalidate( maLowerRect ); } - else if ( maUpperRect.IsInside( rMEvt.GetPosPixel() ) && + else if ( maUpperRect.Contains( rMEvt.GetPosPixel() ) && !mbUpperIn && mbInitialUp ) { mbUpperIn = true; @@ -251,7 +251,7 @@ void SpinButton::MouseMove( const MouseEvent& rMEvt ) maRepeatTimer.Start(); Invalidate( maUpperRect ); } - else if ( maLowerRect.IsInside( rMEvt.GetPosPixel() ) && + else if ( maLowerRect.Contains( rMEvt.GetPosPixel() ) && !mbLowerIn && mbInitialDown ) { mbLowerIn = true; @@ -420,9 +420,9 @@ void SpinButton::ImplCalcFocusRect( bool _bUpper ) tools::Rectangle* SpinButton::ImplFindPartRect( const Point& rPt ) { - if( maUpperRect.IsInside( rPt ) ) + if( maUpperRect.Contains( rPt ) ) return &maUpperRect; - else if( maLowerRect.IsInside( rPt ) ) + else if( maLowerRect.Contains( rPt ) ) return &maLowerRect; else return nullptr; diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index c52ed79e7657..0abaae7a8981 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -49,7 +49,7 @@ void ImplGetSpinbuttonValue(vcl::Window* pWin, nState &= ~ControlState::ENABLED; if (pWin->HasFocus()) nState |= ControlState::FOCUSED; - if (pWin->IsMouseOver() && rUpperRect.IsInside(aPointerPos)) + if (pWin->IsMouseOver() && rUpperRect.Contains(aPointerPos)) nState |= ControlState::ROLLOVER; rValue.mnUpperState = nState; @@ -61,7 +61,7 @@ void ImplGetSpinbuttonValue(vcl::Window* pWin, if (pWin->HasFocus()) nState |= ControlState::FOCUSED; // for overlapping spins: highlight only one - if (pWin->IsMouseOver() && rLowerRect.IsInside(aPointerPos) && !rUpperRect.IsInside(aPointerPos)) + if (pWin->IsMouseOver() && rLowerRect.Contains(aPointerPos) && !rUpperRect.Contains(aPointerPos)) nState |= ControlState::ROLLOVER; rValue.mnLowerState = nState; @@ -383,19 +383,19 @@ void SpinField::MouseButtonDown( const MouseEvent& rMEvt ) if (!IsReadOnly()) { - if (maUpperRect.IsInside(rMEvt.GetPosPixel())) + if (maUpperRect.Contains(rMEvt.GetPosPixel())) { mbUpperIn = true; mbInitialUp = true; Invalidate(maUpperRect); } - else if (maLowerRect.IsInside(rMEvt.GetPosPixel())) + else if (maLowerRect.Contains(rMEvt.GetPosPixel())) { mbLowerIn = true; mbInitialDown = true; Invalidate(maLowerRect); } - else if (maDropDownRect.IsInside(rMEvt.GetPosPixel())) + else if (maDropDownRect.Contains(rMEvt.GetPosPixel())) { // put DropDownButton to the right mbInDropDown = ShowDropDown( !mbInDropDown ); @@ -443,7 +443,7 @@ void SpinField::MouseMove(const MouseEvent& rMEvt) { if (mbInitialUp) { - bool bNewUpperIn = maUpperRect.IsInside(rMEvt.GetPosPixel()); + bool bNewUpperIn = maUpperRect.Contains(rMEvt.GetPosPixel()); if (bNewUpperIn != mbUpperIn) { if (bNewUpperIn) @@ -460,7 +460,7 @@ void SpinField::MouseMove(const MouseEvent& rMEvt) } else if (mbInitialDown) { - bool bNewLowerIn = maLowerRect.IsInside(rMEvt.GetPosPixel()); + bool bNewLowerIn = maLowerRect.Contains(rMEvt.GetPosPixel()); if (bNewLowerIn != mbLowerIn) { if (bNewLowerIn) @@ -820,9 +820,9 @@ void SpinField::DataChanged( const DataChangedEvent& rDCEvt ) tools::Rectangle* SpinField::ImplFindPartRect(const Point& rPt) { - if (maUpperRect.IsInside(rPt)) + if (maUpperRect.Contains(rPt)) return &maUpperRect; - else if (maLowerRect.IsInside(rPt)) + else if (maLowerRect.Contains(rPt)) return &maLowerRect; else return nullptr; diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 2a5a46b52f70..a3e2264d3f8c 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -830,17 +830,17 @@ void TabControl::ImplDrawItem(vcl::RenderContext& rRenderContext, ImplTabItem co if (aLeftTestPos.Y() == rCurRect.Bottom()) { aLeftTestPos.AdjustX( -2 ); - if (rCurRect.IsInside(aLeftTestPos)) + if (rCurRect.Contains(aLeftTestPos)) bLeftBorder = false; aRightTestPos.AdjustX(2 ); - if (rCurRect.IsInside(aRightTestPos)) + if (rCurRect.Contains(aRightTestPos)) bRightBorder = false; } else { - if (rCurRect.IsInside(aLeftTestPos)) + if (rCurRect.Contains(aLeftTestPos)) nLeftBottom -= 2; - if (rCurRect.IsInside(aRightTestPos)) + if (rCurRect.Contains(aRightTestPos)) nRightBottom -= 2; } } @@ -856,11 +856,11 @@ void TabControl::ImplDrawItem(vcl::RenderContext& rRenderContext, ImplTabItem co } if (IsEnabled()) nState |= ControlState::ENABLED; - if (IsMouseOver() && pItem->maRect.IsInside(GetPointerPosPixel())) + if (IsMouseOver() && pItem->maRect.Contains(GetPointerPosPixel())) { nState |= ControlState::ROLLOVER; for (auto const& item : mpTabCtrlData->maItemList) - if ((&item != pItem) && item.m_bVisible && item.maRect.IsInside(GetPointerPosPixel())) + if ((&item != pItem) && item.m_bVisible && item.maRect.Contains(GetPointerPosPixel())) { nState &= ~ControlState::ROLLOVER; // avoid multiple highlighted tabs break; @@ -1522,7 +1522,7 @@ ImplTabItem* TabControl::ImplGetItem(const Point& rPt) const int nFound = 0; for (auto & item : mpTabCtrlData->maItemList) { - if (item.m_bVisible && item.maRect.IsInside(rPt)) + if (item.m_bVisible && item.maRect.Contains(rPt)) { nFound++; pFoundItem = &item; @@ -1787,7 +1787,7 @@ sal_uInt16 TabControl::GetPageId( const Point& rPos ) const Size winSize = Control::GetOutputSizePixel(); const auto &rList = mpTabCtrlData->maItemList; const auto it = std::find_if(rList.begin(), rList.end(), [&rPos, &winSize, this](const auto &item) { - return const_cast<TabControl*>(this)->ImplGetTabRect(&item, winSize.Width(), winSize.Height()).IsInside(rPos); }); + return const_cast<TabControl*>(this)->ImplGetTabRect(&item, winSize.Width(), winSize.Height()).Contains(rPos); }); return (it != rList.end()) ? it->id() : 0; } diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx index 64637dfd4e7c..675d99bc0975 100644 --- a/vcl/source/gdi/regband.cxx +++ b/vcl/source/gdi/regband.cxx @@ -799,7 +799,7 @@ void ImplRegionBand::XOr( tools::Long nXLeft, tools::Long nXRight ) OptimizeBand(); } -bool ImplRegionBand::IsInside( tools::Long nX ) +bool ImplRegionBand::Contains( tools::Long nX ) { ImplRegionBandSep* pSep = mpFirstSep; while ( pSep ) diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 7acf33a53533..22f2c3acc885 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -1336,7 +1336,7 @@ const RegionBand* vcl::Region::GetAsRegionBand() const return getRegionBand(); } -bool vcl::Region::IsInside( const Point& rPoint ) const +bool vcl::Region::Contains( const Point& rPoint ) const { if(IsEmpty()) { @@ -1353,7 +1353,7 @@ bool vcl::Region::IsInside( const Point& rPoint ) const // Too expensive (?) //if(mpImplRegion->getRegionPolyPoly()) //{ - // return mpImplRegion->getRegionPolyPoly()->IsInside( rPoint ); + // return mpImplRegion->getRegionPolyPoly()->Contains( rPoint ); //} // ensure RegionBand existence @@ -1361,13 +1361,13 @@ bool vcl::Region::IsInside( const Point& rPoint ) const if(pRegionBand) { - return pRegionBand->IsInside(rPoint); + return pRegionBand->Contains(rPoint); } return false; } -bool vcl::Region::IsOver( const tools::Rectangle& rRect ) const +bool vcl::Region::Overlaps( const tools::Rectangle& rRect ) const { if(IsEmpty()) { diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index 31d942735d0b..e772d5b27c5b 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -1229,7 +1229,7 @@ void RegionBand::XOr(const RegionBand& rSource) } } -bool RegionBand::IsInside(const Point& rPoint) const +bool RegionBand::Contains(const Point& rPoint) const { // search band list @@ -1241,7 +1241,7 @@ bool RegionBand::IsInside(const Point& rPoint) const if((pBand->mnYTop <= rPoint.Y()) && (pBand->mnYBottom >= rPoint.Y())) { // is point within separation of the band? - return pBand->IsInside(rPoint.X()); + return pBand->Contains(rPoint.X()); } pBand = pBand->mpNextBand; diff --git a/vcl/source/graphic/GraphicObject.cxx b/vcl/source/graphic/GraphicObject.cxx index c8230fd02555..d6c0963b6c61 100644 --- a/vcl/source/graphic/GraphicObject.cxx +++ b/vcl/source/graphic/GraphicObject.cxx @@ -764,7 +764,7 @@ Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMo { AnimationBitmap aAnimationBitmap( aAnim.Get( nFrame ) ); - if( !aCropRect.IsInside( tools::Rectangle(aAnimationBitmap.maPositionPixel, aAnimationBitmap.maSizePixel) ) ) + if( !aCropRect.Contains( tools::Rectangle(aAnimationBitmap.maPositionPixel, aAnimationBitmap.maSizePixel) ) ) { // setup actual cropping (relative to frame position) tools::Rectangle aCropRectRel( aCropRect ); diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index f1aa776629eb..38517d54a8d1 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -813,13 +813,13 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr, { bool bAppend = false; - if( aClip.IsOver( *it ) ) + if( aClip.Overlaps( *it ) ) bAppend = true; else if( rStr[ nIndex ] == ' ' && bInserted ) { std::vector< tools::Rectangle >::const_iterator next = it; ++next; - if( next != aTmp.end() && aClip.IsOver( *next ) ) + if( next != aTmp.end() && aClip.Overlaps( *next ) ) bAppend = true; } diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index fa17063fa0dd..047723ff1a9c 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -775,7 +775,7 @@ bool doesRectCoverWithUniformColor( { // shape needs to fully cover previous content, and have uniform // color - return (rMapModeVDev.LogicToPixel(rCurrRect).IsInside(rPrevRect) && + return (rMapModeVDev.LogicToPixel(rCurrRect).Contains(rPrevRect) && rMapModeVDev.IsFillColor()); } @@ -1511,7 +1511,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, !aTotalComponents.bIsFullyTransparent ) { if( !aBackgroundComponent.aComponentList.empty() && - !aBackgroundComponent.aBounds.IsInside(aTotalBounds) ) + !aBackgroundComponent.aBounds.Contains(aTotalBounds) ) { // it seems the background is not large enough. to // be on the safe side, combine with this component. @@ -1553,7 +1553,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, // component. if( !aCurrCC->aBounds.IsEmpty() && !aCurrCC->bIsFullyTransparent && - aCurrCC->aBounds.IsOver( aTotalBounds ) ) + aCurrCC->aBounds.Overlaps( aTotalBounds ) ) { // union the intersecting aCCList element into aTotalComponents diff --git a/vcl/source/treelist/headbar.cxx b/vcl/source/treelist/headbar.cxx index ae0928231f96..aa1b8cf20dba 100644 --- a/vcl/source/treelist/headbar.cxx +++ b/vcl/source/treelist/headbar.cxx @@ -668,7 +668,7 @@ void HeaderBar::ImplDrag( const Point& rMousePos ) bool bNewOutDrag; tools::Rectangle aItemRect = ImplGetItemRect( nPos ); - bNewOutDrag = !aItemRect.IsInside( rMousePos ); + bNewOutDrag = !aItemRect.Contains( rMousePos ); // if needed switch on ItemDrag if ( bNewOutDrag && mbDragable && !mbItemDrag ) @@ -1151,7 +1151,7 @@ sal_uInt16 HeaderBar::GetItemId( sal_uInt16 nPos ) const sal_uInt16 HeaderBar::GetItemId( const Point& rPos ) const { for ( size_t i = 0, n = mvItemList.size(); i < n; ++i ) { - if ( ImplGetItemRect( i ).IsInside( rPos ) ) { + if ( ImplGetItemRect( i ).Contains( rPos ) ) { return GetItemId( i ); } } diff --git a/vcl/source/treelist/imap.cxx b/vcl/source/treelist/imap.cxx index eafcc4c19859..175fcbb8ff33 100644 --- a/vcl/source/treelist/imap.cxx +++ b/vcl/source/treelist/imap.cxx @@ -201,7 +201,7 @@ IMapObjectType IMapRectangleObject::GetType() const bool IMapRectangleObject::IsHit( const Point& rPoint ) const { - return aRect.IsInside( rPoint ); + return aRect.Contains( rPoint ); } tools::Rectangle IMapRectangleObject::GetRectangle( bool bPixelCoords ) const @@ -458,7 +458,7 @@ IMapObjectType IMapPolygonObject::GetType() const bool IMapPolygonObject::IsHit( const Point& rPoint ) const { - return aPoly.IsInside( rPoint ); + return aPoly.Contains( rPoint ); } tools::Polygon IMapPolygonObject::GetPolygon( bool bPixelCoords ) const diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx index 835ee2eac949..077e897a46a2 100644 --- a/vcl/source/treelist/svimpbox.cxx +++ b/vcl/source/treelist/svimpbox.cxx @@ -764,7 +764,7 @@ bool SvImpLBox::EntryReallyHit(SvTreeListEntry* pEntry, const Point& rPosPixel, Point aPos( rPosPixel ); aPos -= m_pView->GetMapMode().GetOrigin(); - bRet = aRect.IsInside( aPos ); + bRet = aRect.Contains( aPos ); return bRet; } @@ -2898,7 +2898,7 @@ bool SvImpLBox::RequestHelp( const HelpEvent& rHEvt ) if( rHEvt.GetMode() & HelpEventMode::QUICK ) { Point aPos( m_pView->ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - if( !GetVisibleArea().IsInside( aPos )) + if( !GetVisibleArea().Contains( aPos )) return false; SvTreeListEntry* pEntry = GetEntry( aPos ); @@ -2925,7 +2925,7 @@ bool SvImpLBox::RequestHelp( const HelpEvent& rHEvt ) tools::Rectangle aViewRect( GetVisibleArea() ); - if( bItemClipped || !aViewRect.IsInside( aItemRect ) ) + if( bItemClipped || !aViewRect.Contains( aItemRect ) ) { // clip the right edge of the item at the edge of the view //if( aItemRect.Right() > aViewRect.Right() ) diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx index fd7a68c5d598..57f1ce2f36df 100644 --- a/vcl/source/treelist/svtabbx.cxx +++ b/vcl/source/treelist/svtabbx.cxx @@ -1065,7 +1065,7 @@ sal_Int32 SvHeaderTabListBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nC sal_Int32 nPos = 0; for (auto const& rectangle : aRects) { - if( rectangle.IsInside(_rPoint) ) + if( rectangle.Contains(_rPoint) ) return nPos; ++nPos; } diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index 84d2f4f8aab8..069b1d9c95ce 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -1918,13 +1918,13 @@ bool SvTreeListBox::PosOverBody(const Point& rPos) const if (pImpl->m_aVerSBar->IsVisible()) { tools::Rectangle aRect(pImpl->m_aVerSBar->GetPosPixel(), pImpl->m_aVerSBar->GetSizePixel()); - if (aRect.IsInside(rPos)) + if (aRect.Contains(rPos)) return false; } if (pImpl->m_aHorSBar->IsVisible()) { tools::Rectangle aRect(pImpl->m_aHorSBar->GetPosPixel(), pImpl->m_aHorSBar->GetSizePixel()); - if (aRect.IsInside(rPos)) + if (aRect.Contains(rPos)) return false; } return true; diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 76b07edbe9a4..95d508ce3597 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -175,17 +175,17 @@ BorderWindowHitTest ImplBorderWindowView::ImplHitTest( ImplBorderFrameData const { ImplBorderWindow* pBorderWindow = pData->mpBorderWindow; - if ( pData->maTitleRect.IsInside( rPos ) ) + if ( pData->maTitleRect.Contains( rPos ) ) { - if ( pData->maCloseRect.IsInside( rPos ) ) + if ( pData->maCloseRect.Contains( rPos ) ) return BorderWindowHitTest::Close; - else if ( pData->maMenuRect.IsInside( rPos ) ) + else if ( pData->maMenuRect.Contains( rPos ) ) return BorderWindowHitTest::Menu; - else if ( pData->maDockRect.IsInside( rPos ) ) + else if ( pData->maDockRect.Contains( rPos ) ) return BorderWindowHitTest::Dock; - else if ( pData->maHideRect.IsInside( rPos ) ) + else if ( pData->maHideRect.Contains( rPos ) ) return BorderWindowHitTest::Hide; - else if ( pData->maHelpRect.IsInside( rPos ) ) + else if ( pData->maHelpRect.Contains( rPos ) ) return BorderWindowHitTest::Help; else return BorderWindowHitTest::Title; @@ -974,7 +974,7 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) if ( maFrameData.mnHitTest & BorderWindowHitTest::Close ) { - if ( maFrameData.maCloseRect.IsInside( aMousePos ) ) + if ( maFrameData.maCloseRect.Contains( aMousePos ) ) { if ( !(maFrameData.mnCloseState & DrawButtonFlags::Pressed) ) { @@ -993,7 +993,7 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) } else if ( maFrameData.mnHitTest & BorderWindowHitTest::Dock ) { - if ( maFrameData.maDockRect.IsInside( aMousePos ) ) + if ( maFrameData.maDockRect.Contains( aMousePos ) ) { if ( !(maFrameData.mnDockState & DrawButtonFlags::Pressed) ) { @@ -1012,7 +1012,7 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) } else if ( maFrameData.mnHitTest & BorderWindowHitTest::Menu ) { - if ( maFrameData.maMenuRect.IsInside( aMousePos ) ) + if ( maFrameData.maMenuRect.Contains( aMousePos ) ) { if ( !(maFrameData.mnMenuState & DrawButtonFlags::Pressed) ) { @@ -1031,7 +1031,7 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) } else if ( maFrameData.mnHitTest & BorderWindowHitTest::Hide ) { - if ( maFrameData.maHideRect.IsInside( aMousePos ) ) + if ( maFrameData.maHideRect.Contains( aMousePos ) ) { if ( !(maFrameData.mnHideState & DrawButtonFlags::Pressed) ) { @@ -1050,7 +1050,7 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) } else if ( maFrameData.mnHitTest & BorderWindowHitTest::Help ) { - if ( maFrameData.maHelpRect.IsInside( aMousePos ) ) + if ( maFrameData.maHelpRect.Contains( aMousePos ) ) { if ( !(maFrameData.mnHelpState & DrawButtonFlags::Pressed) ) { diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index a03e2146d944..645aa8dc19e5 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -179,7 +179,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl, void*, void) aBorderRect.AdjustRight( -nRight ); PointerState aBorderState = pBorder->GetPointerState(); - bRealMove = aBorderRect.IsInside( aBorderState.maPos ); + bRealMove = aBorderRect.Contains( aBorderState.maPos ); } } diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index 1c4106ba109b..bc6e2f0f8f42 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -118,7 +118,7 @@ bool Window::EventNotify( NotifyEvent& rNEvt ) if ( rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN ) { const MouseEvent* pMEvt = rNEvt.GetMouseEvent(); - bool bHit = pWrapper->GetDragArea().IsInside( pMEvt->GetPosPixel() ); + bool bHit = pWrapper->GetDragArea().Contains( pMEvt->GetPosPixel() ); if ( pMEvt->IsLeft() ) { if (!bDockingSupportCrippled && pMEvt->IsMod1() && (pMEvt->GetClicks() == 2)) @@ -138,7 +138,7 @@ bool Window::EventNotify( NotifyEvent& rNEvt ) else if ( rNEvt.GetType() == MouseNotifyEvent::MOUSEMOVE ) { const MouseEvent* pMEvt = rNEvt.GetMouseEvent(); - bool bHit = pWrapper->GetDragArea().IsInside( pMEvt->GetPosPixel() ); + bool bHit = pWrapper->GetDragArea().Contains( pMEvt->GetPosPixel() ); if ( pMEvt->IsLeft() ) { // check if a single click initiated this sequence ( ImplStartDockingEnabled() ) diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 0b333f87df76..d218e243f862 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -563,7 +563,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference, const // the top-left corner in output coordinates ie (0,0) tools::Rectangle devRect( pBorderWin->ImplOutputToUnmirroredAbsoluteScreenPixel( tools::Rectangle( Point(), pBorderWin->GetSizePixel()) ) ) ; - if ( devRect.IsInside( aAbsolute ) ) + if ( devRect.Contains( aAbsolute ) ) { // inside the window return pWin; @@ -573,7 +573,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference, const // toolbox item or similar) // note: maFloatRect is set in FloatingWindow::StartPopupMode() and // is already in absolute device coordinates - if ( pWin->maFloatRect.IsInside( aAbsolute ) ) + if ( pWin->maFloatRect.Contains( aAbsolute ) ) { rbHitTestInsideRect = true; return pWin; diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 4c38928b37f0..4d25a0671836 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1569,7 +1569,7 @@ class DisclosureButton final : public CheckBox nState |= ControlState::DEFAULT; if (Window::IsEnabled()) nState |= ControlState::ENABLED; - if (IsMouseOver() && GetMouseRect().IsInside(GetPointerPosPixel())) + if (IsMouseOver() && GetMouseRect().Contains(GetPointerPosPixel())) nState |= ControlState::ROLLOVER; if (rRenderContext.DrawNativeControl(ControlType::ListNode, ControlPart::Entire, aCtrlRegion, diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index e77402ea600e..f443509af71d 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -61,14 +61,14 @@ WindowHitTest Window::ImplHitTest( const Point& rFramePos ) const OutputDevice *pOutDev = GetOutDev(); pOutDev->ReMirror( aFramePos ); } - if ( !GetOutputRectPixel().IsInside( aFramePos ) ) + if ( !GetOutputRectPixel().Contains( aFramePos ) ) return WindowHitTest::NONE; if ( mpWindowImpl->mbWinRegion ) { Point aTempPos = aFramePos; aTempPos.AdjustX( -GetOutDev()->mnOutOffX ); aTempPos.AdjustY( -GetOutDev()->mnOutOffY ); - if ( !mpWindowImpl->maWinRegion.IsInside( aTempPos ) ) + if ( !mpWindowImpl->maWinRegion.Contains( aTempPos ) ) return WindowHitTest::NONE; } @@ -86,7 +86,7 @@ bool Window::ImplTestMousePointerSet() // if the mouse is over the window, switch it tools::Rectangle aClientRect( Point( 0, 0 ), GetOutputSizePixel() ); - return aClientRect.IsInside( GetPointerPosPixel() ); + return aClientRect.Contains( GetPointerPosPixel() ); } PointerStyle Window::ImplGetMousePointer() const diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index ed4e68b23c73..88e1c1a5f6dd 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -55,7 +55,7 @@ SelectionEngine::~SelectionEngine() IMPL_LINK_NOARG(SelectionEngine, ImpWatchDog, Timer *, void) { - if ( !aArea.IsInside( aLastMove.GetPosPixel() ) ) + if ( !aArea.Contains( aLastMove.GetPosPixel() ) ) SelMouseMove( aLastMove ); } @@ -322,7 +322,7 @@ bool SelectionEngine::SelMouseMove( const MouseEvent& rMEvt ) aLastMove = rMEvt; // if the mouse is outside the area, the frequency of // SetCursorAtPoint() is only set by the Timer - if( aWTimer.IsActive() && !aArea.IsInside( rMEvt.GetPosPixel() )) + if( aWTimer.IsActive() && !aArea.Contains( rMEvt.GetPosPixel() )) return true; aWTimer.SetTimeout( nUpdateInterval ); diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index ed32ca8f44fd..fa3cada9ecfa 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -330,7 +330,7 @@ static sal_uInt16 ImplFindItem( ImplSplitSet* pSet, const Point& rPos, aRect.AdjustLeft( -(pSet->mnSplitSize) ); } - if ( aRect.IsInside( rPos ) ) + if ( aRect.Contains( rPos ) ) { if ( rItem.mpSet && !rItem.mpSet->mvItems.empty() ) { @@ -1468,7 +1468,7 @@ void SplitWindow::ImplDrawGrip(vcl::RenderContext& rRenderContext, const tools:: Color aColor; - if (rRect.IsInside(GetPointerPosPixel())) + if (rRect.Contains(GetPointerPosPixel())) { vcl::RenderTools::DrawSelectionBackground(rRenderContext, *this, rRect, 2, false, false, false); @@ -1813,7 +1813,7 @@ void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt ) mbFadeNoButtonMode = false; ImplGetFadeOutRect( aTestRect ); - if ( aTestRect.IsInside( aMousePosPixel ) ) + if ( aTestRect.Contains( aMousePosPixel ) ) { mbFadeOutDown = true; mbFadeOutPressed = true; @@ -1822,7 +1822,7 @@ void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt ) else { ImplGetFadeInRect( aTestRect, true ); - if ( aTestRect.IsInside( aMousePosPixel ) ) + if ( aTestRect.Contains( aMousePosPixel ) ) { mbFadeInDown = true; mbFadeInPressed = true; @@ -1858,8 +1858,8 @@ void SplitWindow::MouseMove( const MouseEvent& rMEvt ) ImplGetFadeInRect( aFadeInRect ); ImplGetFadeOutRect( aFadeOutRect ); - if ( !aFadeInRect.IsInside( aPos ) && - !aFadeOutRect.IsInside( aPos ) ) + if ( !aFadeInRect.Contains( aPos ) && + !aFadeOutRect.Contains( aPos ) ) { if ( nSplitTest && !(nSplitTest & SPLIT_NOSPLIT) ) { @@ -1895,7 +1895,7 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) { tools::Rectangle aTestRect; ImplGetFadeInRect( aTestRect, true ); - bool bNewPressed = aTestRect.IsInside( aMousePosPixel ); + bool bNewPressed = aTestRect.Contains( aMousePosPixel ); if ( bNewPressed != mbFadeInPressed ) { mbFadeInPressed = bNewPressed; @@ -1921,7 +1921,7 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) { tools::Rectangle aTestRect; ImplGetFadeOutRect( aTestRect ); - bool bNewPressed = aTestRect.IsInside( aMousePosPixel ); + bool bNewPressed = aTestRect.Contains( aMousePosPixel ); if ( !bNewPressed ) { mbFadeOutPressed = bNewPressed; @@ -2035,9 +2035,9 @@ bool SplitWindow::PreNotify( NotifyEvent& rNEvt ) ImplGetFadeInRect( aFadeInRect ); ImplGetFadeOutRect( aFadeOutRect ); - if ( aFadeInRect.IsInside( GetPointerPosPixel() ) != aFadeInRect.IsInside( GetLastPointerPosPixel() ) ) + if ( aFadeInRect.Contains( GetPointerPosPixel() ) != aFadeInRect.Contains( GetLastPointerPosPixel() ) ) Invalidate( aFadeInRect ); - if ( aFadeOutRect.IsInside( GetPointerPosPixel() ) != aFadeOutRect.IsInside( GetLastPointerPosPixel() ) ) + if ( aFadeOutRect.Contains( GetPointerPosPixel() ) != aFadeOutRect.Contains( GetLastPointerPosPixel() ) ) Invalidate( aFadeOutRect ); if( pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow() ) @@ -2086,12 +2086,12 @@ void SplitWindow::RequestHelp( const HelpEvent& rHEvt ) TranslateId pHelpResId; ImplGetFadeInRect( aHelpRect, true ); - if ( aHelpRect.IsInside( aMousePosPixel ) ) + if ( aHelpRect.Contains( aMousePosPixel ) ) pHelpResId = SV_HELPTEXT_FADEIN; else { ImplGetFadeOutRect( aHelpRect ); - if ( aHelpRect.IsInside( aMousePosPixel ) ) + if ( aHelpRect.Contains( aMousePosPixel ) ) pHelpResId = SV_HELPTEXT_FADEOUT; } diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index 3a04e3c8f8d1..928c456eee93 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -569,7 +569,7 @@ void Window::SetZOrder( vcl::Window* pRefWindow, ZOrderFlags nFlags ) if ( pWindow == this ) break; tools::Rectangle aCompRect = pWindow->GetOutputRectPixel(); - if ( aWinRect.IsOver( aCompRect ) ) + if ( aWinRect.Overlaps( aCompRect ) ) pWindow->Invalidate( InvalidateFlags::Children | InvalidateFlags::NoTransparent ); pWindow = pWindow->mpWindowImpl->mpNext; } @@ -581,7 +581,7 @@ void Window::SetZOrder( vcl::Window* pRefWindow, ZOrderFlags nFlags ) if ( pWindow != this ) { tools::Rectangle aCompRect = pWindow->GetOutputRectPixel(); - if ( aWinRect.IsOver( aCompRect ) ) + if ( aWinRect.Overlaps( aCompRect ) ) { Invalidate( InvalidateFlags::Children | InvalidateFlags::NoTransparent ); break; diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 4be4b722111d..48694de7b777 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -665,7 +665,7 @@ void StatusBar::MouseButtonDown( const MouseEvent& rMEvt ) { ImplStatusItem* pItem = mvItemList[ i ].get(); // check item for being clicked - if ( ImplGetItemRectPos( sal_uInt16(i) ).IsInside( aMousePos ) ) + if ( ImplGetItemRectPos( sal_uInt16(i) ).Contains( aMousePos ) ) { mnCurItemId = pItem->mnId; if ( rMEvt.GetClicks() == 2 ) @@ -1030,7 +1030,7 @@ sal_uInt16 StatusBar::GetItemId( const Point& rPos ) const { // get rectangle tools::Rectangle aRect = ImplGetItemRectPos( nPos ); - if ( aRect.IsInside( rPos ) ) + if ( aRect.Contains( rPos ) ) return mvItemList[ nPos ]->mnId; } } diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index ee1359ca0491..ea731d784a7d 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2882,7 +2882,7 @@ bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat ) { // is the cursor over the item? ImplToolItem* pItem = &mpData->m_aItems[mnCurPos]; - if ( pItem->maRect.IsInside( aMousePos ) ) + if ( pItem->maRect.Contains( aMousePos ) ) { if ( !mnCurItemId ) { @@ -2910,7 +2910,7 @@ bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat ) if ( mbUpper ) { - bool bNewIn = maUpperRect.IsInside( aMousePos ); + bool bNewIn = maUpperRect.Contains( aMousePos ); if ( bNewIn != mbIn ) { mbIn = bNewIn; @@ -2921,7 +2921,7 @@ bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat ) if ( mbLower ) { - bool bNewIn = maLowerRect.IsInside( aMousePos ); + bool bNewIn = maLowerRect.Contains( aMousePos ); if ( bNewIn != mbIn ) { mbIn = bNewIn; @@ -2961,7 +2961,7 @@ bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel ) if( mnCurPos < mpData->m_aItems.size() ) { ImplToolItem* pItem = &mpData->m_aItems[mnCurPos]; - if ( pItem->maRect.IsInside( rMEvt.GetPosPixel() ) ) + if ( pItem->maRect.Contains( rMEvt.GetPosPixel() ) ) { mnCurItemId = pItem->mnId; if ( !bCancel ) @@ -3080,7 +3080,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) // change mouse cursor over drag area ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this ); - if( pWrapper && pWrapper->GetDragArea().IsInside( rMEvt.GetPosPixel() ) ) + if( pWrapper && pWrapper->GetDragArea().Contains( rMEvt.GetPosPixel() ) ) eStyle = PointerStyle::Move; if ( (mnWinStyle & TB_WBLINESIZING) == TB_WBLINESIZING ) @@ -3113,7 +3113,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) ImplToolItems::size_type nTempPos = 0; for (auto const& item : mpData->m_aItems) { - if ( item.maRect.IsInside( aMousePos ) ) + if ( item.maRect.Contains( aMousePos ) ) { if ( (item.meType == ToolBoxItemType::BUTTON) && item.mbEnabled ) { @@ -3145,7 +3145,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) } // only clear highlight when focus is not in toolbar - bool bMenuButtonHit = mpData->maMenubuttonItem.maRect.IsInside( aMousePos ) && ImplHasClippedItems(); + bool bMenuButtonHit = mpData->maMenubuttonItem.maRect.Contains( aMousePos ) && ImplHasClippedItems(); if ( !HasFocus() && (bClearHigh || bMenuButtonHit) ) { if ( !bMenuButtonHit && mpData->mbMenubuttonSelected ) @@ -3208,7 +3208,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) for (auto const& item : mpData->m_aItems) { // is this the item? - if ( item.maRect.IsInside( aMousePos ) ) + if ( item.maRect.Contains( aMousePos ) ) { // do nothing if it is a separator or // if the item has been disabled @@ -3259,7 +3259,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) if( mpData->m_aItems[nNewPos].mnBits & ToolBoxItemBits::DROPDOWN ) { if( ( (mpData->m_aItems[nNewPos].mnBits & ToolBoxItemBits::DROPDOWNONLY) == ToolBoxItemBits::DROPDOWNONLY) - || mpData->m_aItems[nNewPos].GetDropDownRect( mbHorz ).IsInside( aMousePos )) + || mpData->m_aItems[nNewPos].GetDropDownRect( mbHorz ).Contains( aMousePos )) { // dropdownonly always triggers the dropdown handler, over the whole button area @@ -3307,7 +3307,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) Deactivate(); // menu button hit ? - if( mpData->maMenubuttonItem.maRect.IsInside( aMousePos ) && ImplHasClippedItems() ) + if( mpData->maMenubuttonItem.maRect.Contains( aMousePos ) && ImplHasClippedItems() ) { if ( maMenuButtonHdl.IsSet() ) maMenuButtonHdl.Call( this ); @@ -3317,7 +3317,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) } // check scroll- and next-buttons here - if ( maUpperRect.IsInside( aMousePos ) ) + if ( maUpperRect.Contains( aMousePos ) ) { if ( mnCurLine > 1 ) { @@ -3328,7 +3328,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) } return; } - if ( maLowerRect.IsInside( aMousePos ) ) + if ( maLowerRect.Contains( aMousePos ) ) { if ( mnCurLine+mnVisLines-1 < mnCurLines ) { @@ -3468,7 +3468,7 @@ void ToolBox::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& ImplToolItem* pItem = &mpData->m_aItems[i]; // only draw when the rectangle is in the draw rectangle - if ( !pItem->maRect.IsEmpty() && rPaintRect.IsOver( pItem->maRect ) ) + if ( !pItem->maRect.IsEmpty() && rPaintRect.Overlaps( pItem->maRect ) ) { sal_uInt16 nHighlight = 0; if ( i == mnCurPos ) diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 5b3cb621a28a..ad4668e6ce86 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -732,7 +732,7 @@ ToolBox::ImplToolItems::size_type ToolBox::GetItemPos( const Point& rPos ) const { // search the item position on the given point auto it = std::find_if(mpData->m_aItems.begin(), mpData->m_aItems.end(), - [&rPos](const ImplToolItem& rItem) { return rItem.maRect.IsInside( rPos ); }); + [&rPos](const ImplToolItem& rItem) { return rItem.maRect.Contains( rPos ); }); if( it != mpData->m_aItems.end() ) return std::distance(mpData->m_aItems.begin(), it); @@ -749,7 +749,7 @@ ToolBoxItemId ToolBox::GetItemId( const Point& rPos ) const { // find item that was clicked auto it = std::find_if(mpData->m_aItems.begin(), mpData->m_aItems.end(), - [&rPos](const ImplToolItem& rItem) { return rItem.maRect.IsInside( rPos ); }); + [&rPos](const ImplToolItem& rItem) { return rItem.maRect.Contains( rPos ); }); if( (it != mpData->m_aItems.end()) && (it->meType == ToolBoxItemType::BUTTON) ) return it->mnId; @@ -1316,7 +1316,7 @@ bool ToolBox::IsItemReallyVisible( ToolBoxItemId nItemId ) const ImplToolItem* pItem = ImplGetItem( nItemId ); if ( pItem && pItem->mbVisible && - !pItem->maRect.IsEmpty() && aRect.IsOver( pItem->maRect ) ) + !pItem->maRect.IsEmpty() && aRect.Overlaps( pItem->maRect ) ) { bRet = true; } diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index fe6f465b90b6..c81272434136 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -1446,7 +1446,7 @@ void WMAdaptor::maximizeFrame( X11SalFrame* pFrame, bool bHorizontal, bool bVert Point aMed( aTL.X() + rGeom.nWidth/2, aTL.Y() + rGeom.nHeight/2 ); const std::vector< tools::Rectangle >& rScreens = m_pSalDisplay->GetXineramaScreens(); for(const auto & rScreen : rScreens) - if( rScreen.IsInside( aMed ) ) + if( rScreen.Contains( aMed ) ) { aTL += rScreen.TopLeft(); aScreenSize = rScreen.GetSize(); @@ -1960,7 +1960,7 @@ void NetWMAdaptor::showFullScreen( X11SalFrame* pFrame, bool bFullScreen ) const Point aMousePoint( root_x, root_y ); for(const auto & rScreen : rScreens) { - if( rScreen.IsInside( aMousePoint ) ) + if( rScreen.Contains( aMousePoint ) ) { pFrame->maGeometry.nX = rScreen.Left(); pFrame->maGeometry.nY = rScreen.Top(); diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index a47ed1c645fa..d08bd9dbe2c3 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -542,7 +542,7 @@ void X11SalFrame::Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nXScreen &root_x, &root_y, &lx, &ly, &mask ); const std::vector< tools::Rectangle >& rScreens = GetDisplay()->GetXineramaScreens(); for(const auto & rScreen : rScreens) - if( rScreen.IsInside( Point( root_x, root_y ) ) ) + if( rScreen.Contains( Point( root_x, root_y ) ) ) { x = rScreen.Left(); y = rScreen.Top(); @@ -1463,7 +1463,7 @@ void X11SalFrame::Center( ) &mask ); const std::vector< tools::Rectangle >& rScreens = GetDisplay()->GetXineramaScreens(); for(const auto & rScreen : rScreens) - if( rScreen.IsInside( Point( root_x, root_y ) ) ) + if( rScreen.Contains( Point( root_x, root_y ) ) ) { nScreenX = rScreen.Left(); nScreenY = rScreen.Top(); @@ -1553,7 +1553,7 @@ void X11SalFrame::updateScreenNumber() size_t nScreens = rScreenRects.size(); for( size_t i = 0; i < nScreens; i++ ) { - if( rScreenRects[i].IsInside( aPoint ) ) + if( rScreenRects[i].Contains( aPoint ) ) { maGeometry.nDisplayScreenNumber = static_cast<unsigned int>(i); break; diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 259a1395a3b2..89d1d10c6961 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -897,7 +897,7 @@ void WinSalFrame::updateScreenNumber() size_t nMon = rMonitors.size(); for( size_t i = 0; i < nMon; i++ ) { - if( rMonitors[i].m_aArea.IsInside( aPoint ) ) + if( rMonitors[i].m_aArea.Contains( aPoint ) ) { mnDisplay = static_cast<sal_Int32>(i); maGeometry.nDisplayScreenNumber = static_cast<unsigned int>(i); @@ -1769,7 +1769,7 @@ void WinSalFrame::SetScreenNumber( unsigned int nNewScreen ) Point aCurPos( maGeometry.nX, maGeometry.nY ); for( size_t i = 0; i < nMon; i++ ) { - if( rMonitors[i].m_aArea.IsInside( aCurPos ) ) + if( rMonitors[i].m_aArea.Contains( aCurPos ) ) { aOldMonPos = rMonitors[i].m_aArea.TopLeft(); break; @@ -3096,7 +3096,7 @@ static bool ImplHandleMouseMsg( HWND hWnd, UINT nMsg, if (const auto& pHelpWin = ImplGetSVHelpData().mpHelpWin) { const tools::Rectangle& rHelpRect = pHelpWin->GetHelpArea(); - if (rHelpRect.IsInside(Point(aPt.x, aPt.y))) + if (rHelpRect.Contains(Point(aPt.x, aPt.y))) { // We have entered a tooltip (help window). Don't call the handler here; it // would launch the sequence "Mouse leaves the Control->Control redraws-> diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 691ef192858f..27a91e91973f 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1577,7 +1577,7 @@ bool DemoRenderer::MouseButtonDown(const MouseEvent& rMEvt) std::vector<tools::Rectangle> aRegions(partition(GetSizePixel(), mnSegmentsX, mnSegmentsY)); for (size_t i = 0; i < aRegions.size(); i++) { - if (aRegions[i].IsInside(rMEvt.GetPosPixel())) + if (aRegions[i].Contains(rMEvt.GetPosPixel())) { mnSelectedRenderer = i; Invalidate(); |