strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

there's already a way to customize the invalidation

Browse source 
Change-Id: I486494de730b8665e56cfc664b62830fb0b8b8ee
Reviewed-on: https://gerrit.libreoffice.org/72415
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2019-05-16 13:57:07 +01:00
parent b5bc0d40ce
commit 810e1a86b0
9 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/svx/graphctl.hxx
View file

@ -264,7 +264,8 @@ public:
// override these so we can get the occasions SdrPaintView would call Window::Invalidate on its vcl::Window
// if it had one, and route to WidgetController::Invalidate instead
virtual rtl::Reference<sdr::overlay::OverlayManager> CreateOverlayManager(OutputDevice& rDevice) const override;
virtual void InvalidateWindow(const tools::Rectangle& rArea, OutputDevice& rDevice) const override;
virtual void InvalidateOneWin(OutputDevice& rWin) override;
virtual void InvalidateOneWin(OutputDevice& rWin, const tools::Rectangle& rRect) override;
};
#endif // INCLUDED_SVX_GRAPHCTL_HXX

5
include/svx/svdpntv.hxx
View file

@ -238,7 +238,6 @@ public:
SdrPaintWindow* GetPaintWindow(sal_uInt32 nIndex) const;
// Replacement for GetWin(0), may return 0L (!)
OutputDevice* GetFirstOutputDevice() const;
virtual void InvalidateWindow(const tools::Rectangle& rArea, OutputDevice& rDevice) const;
private:
SVX_DLLPRIVATE void ImpClearVars();
@ -432,8 +431,8 @@ public:
/// If the View should not call Invalidate() on the windows, override
/// the following 2 methods and do something else.
virtual void InvalidateOneWin(vcl::Window& rWin);
virtual void InvalidateOneWin(vcl::Window& rWin, const tools::Rectangle& rRect);
virtual void InvalidateOneWin(OutputDevice& rWin);
virtual void InvalidateOneWin(OutputDevice& rWin, const tools::Rectangle& rRect);
void SetActiveLayer(const OUString& rName) { maActualLayer=rName; }
const OUString& GetActiveLayer() const { return maActualLayer; }

4
sd/source/ui/inc/ClientView.hxx
View file

@ -38,8 +38,8 @@ public:
/* if the view should not do a Invalidate() on the windows, you have to
override the following two methods and do something different */
virtual void InvalidateOneWin(vcl::Window& rWin) override;
virtual void InvalidateOneWin(vcl::Window& rWin, const ::tools::Rectangle& rRect) override;
virtual void InvalidateOneWin(OutputDevice& rWin) override;
virtual void InvalidateOneWin(OutputDevice& rWin, const ::tools::Rectangle& rRect) override;
};
} // end of namespace sd

4
sd/source/ui/view/clview.cxx
View file

@ -48,7 +48,7 @@ ClientView::~ClientView()
* to be overridden and properly handled.
*/
void ClientView::InvalidateOneWin(vcl::Window& rWin)
void ClientView::InvalidateOneWin(OutputDevice& rWin)
{
vcl::Region aRegion;
CompleteRedraw(&rWin, aRegion);
@ -59,7 +59,7 @@ void ClientView::InvalidateOneWin(vcl::Window& rWin)
* to be overridden and properly handled.
*/
void ClientView::InvalidateOneWin(vcl::Window& rWin, const ::tools::Rectangle& rRect)
void ClientView::InvalidateOneWin(OutputDevice& rWin, const ::tools::Rectangle& rRect)
{
CompleteRedraw(&rWin, vcl::Region(rRect));
}

15
svx/source/dialog/graphctl.cxx
View file

@ -1494,7 +1494,18 @@ rtl::Reference<sdr::overlay::OverlayManager> SvxGraphCtrlView::CreateOverlayMana
return SdrView::CreateOverlayManager(rDevice);
}
void SvxGraphCtrlView::InvalidateWindow(const tools::Rectangle& rArea, OutputDevice& rDevice) const
void SvxGraphCtrlView::InvalidateOneWin(OutputDevice& rDevice)
{
assert(&rDevice == &rGraphCtrl.GetDrawingArea()->get_ref_device());
if (rDevice.GetOutDevType() == OUTDEV_VIRDEV)
{
rGraphCtrl.Invalidate();
return;
}
SdrView::InvalidateOneWin(rDevice);
}
void SvxGraphCtrlView::InvalidateOneWin(OutputDevice& rDevice, const tools::Rectangle& rArea)
{
assert(&rDevice == &rGraphCtrl.GetDrawingArea()->get_ref_device());
if (rDevice.GetOutDevType() == OUTDEV_VIRDEV)
@ -1502,7 +1513,7 @@ void SvxGraphCtrlView::InvalidateWindow(const tools::Rectangle& rArea, OutputDev
rGraphCtrl.Invalidate(rArea);
return;
}
SdrView::InvalidateWindow(rArea, rDevice);
SdrView::InvalidateOneWin(rDevice, rArea);
}
Point SvxGraphCtrl::GetPositionInDialog() const

2
svx/source/svdraw/sdrpagewindow.cxx
View file

@ -432,7 +432,7 @@ void SdrPageWindow::InvalidatePageWindow(const basegfx::B2DRange& rRange)
const bool bWasMapModeEnabled(rWindow.IsMapModeEnabled());
rWindow.EnableMapMode(false);
GetPageView().GetView().InvalidateWindow(aVCLDiscreteRectangle, rWindow);
GetPageView().GetView().InvalidateOneWin(rWindow, aVCLDiscreteRectangle);
rWindow.EnableMapMode(bWasMapModeEnabled);
}
else if (comphelper::LibreOfficeKit::isActive())

6
svx/source/svdraw/sdrpaintwindow.cxx
View file

@ -225,12 +225,6 @@ rtl::Reference<sdr::overlay::OverlayManager> SdrPaintView::CreateOverlayManager(
return xOverlayManager;
}
void SdrPaintView::InvalidateWindow(const tools::Rectangle& rArea, OutputDevice& rDevice) const
{
vcl::Window& rWindow(static_cast<vcl::Window&>(rDevice));
rWindow.Invalidate(rArea, InvalidateFlags::NoErase);
}
void SdrPaintWindow::impCreateOverlayManager()
{
// not yet one created?

2
svx/source/svdraw/svdpagv.cxx
View file

@ -670,7 +670,7 @@ void SdrPageView::ImpInvalidateHelpLineArea(sal_uInt16 nNum) const
aR.AdjustRight(aSiz.Width() );
aR.AdjustTop( -(aSiz.Height()) );
aR.AdjustBottom(aSiz.Height() );
const_cast<SdrView&>(GetView()).InvalidateOneWin(static_cast<vcl::Window&>(rOutDev), aR);
const_cast<SdrView&>(GetView()).InvalidateOneWin(rOutDev, aR);
}
}
}

10
svx/source/svdraw/svdpntv.cxx
View file

@ -859,7 +859,7 @@ void SdrPaintView::InvalidateAllWin()
if(pPaintWindow->OutputToWindow())
{
InvalidateOneWin(static_cast<vcl::Window&>(pPaintWindow->GetOutputDevice()));
InvalidateOneWin(pPaintWindow->GetOutputDevice());
}
}
}
@ -884,20 +884,22 @@ void SdrPaintView::InvalidateAllWin(const tools::Rectangle& rRect)
// In case of tiled rendering we want to get all invalidations, so visual area is not interesting.
if (aRect.IsOver(aOutRect) || comphelper::LibreOfficeKit::isActive())
{
InvalidateOneWin(static_cast<vcl::Window&>(rOutDev), aRect);
InvalidateOneWin(rOutDev, aRect);
}
}
}
}
void SdrPaintView::InvalidateOneWin(vcl::Window& rWin)
void SdrPaintView::InvalidateOneWin(OutputDevice& rDevice)
{
vcl::Window& rWin(static_cast<vcl::Window&>(rDevice));
// do not erase background, that causes flicker (!)
rWin.Invalidate(InvalidateFlags::NoErase);
}
void SdrPaintView::InvalidateOneWin(vcl::Window& rWin, const tools::Rectangle& rRect)
void SdrPaintView::InvalidateOneWin(OutputDevice& rDevice, const tools::Rectangle& rRect)
{
vcl::Window& rWin(static_cast<vcl::Window&>(rDevice));
// do not erase background, that causes flicker (!)
rWin.Invalidate(rRect, InvalidateFlags::NoErase);
}