diff options
| -rw-r--r-- | include/svx/svdmrkv.hxx | 10 | ||||
| -rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 48 |
2 files changed, 55 insertions, 3 deletions
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index c66ddf5bca8e..4b94f630cbb7 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -26,6 +26,8 @@ #include <svx/svdtypes.hxx> #include <svx/svxdllapi.h> #include <o3tl/typed_flags_set.hxx> +#include <basegfx/range/b2drectangle.hxx> + class SfxViewShell; @@ -88,6 +90,7 @@ enum class ImpGetDescriptionOptions }; class ImplMarkingOverlay; +class MarkingSubSelectionOverlay; class SVX_DLLPUBLIC SdrMarkView : public SdrSnapView { @@ -98,6 +101,8 @@ class SVX_DLLPUBLIC SdrMarkView : public SdrSnapView std::unique_ptr<ImplMarkingOverlay> mpMarkPointsOverlay; std::unique_ptr<ImplMarkingOverlay> mpMarkGluePointsOverlay; + std::unique_ptr<MarkingSubSelectionOverlay> mpMarkingSubSelectionOverlay; + protected: SdrObject* mpMarkedObj; // If not just one object ( i.e. More than one object ) is marked. SdrPageView* mpMarkedPV; // If all marked obects are situated on the same PageView. @@ -106,8 +111,10 @@ protected: Point maRef2; // Persistent Point maLastCrookCenter; // Persistent SdrHdlList maHdlList; + sdr::ViewSelection maSdrViewSelection; + std::vector<basegfx::B2DRectangle> maSubSelectionList; tools::Rectangle maMarkedObjRect; tools::Rectangle maMarkedObjRectNoOffset; tools::Rectangle maMarkedPointsRect; @@ -294,7 +301,8 @@ public: // Mark all objects within a rectangular area // Just objects are marked which are inclosed completely void MarkObj(const tools::Rectangle& rRect, bool bUnmark); - void MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark=false, bool bImpNoSetMarkHdl=false); + void MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark = false, bool bDoNoSetMarkHdl = false, + std::vector<basegfx::B2DRectangle> const & rSubSelections = std::vector<basegfx::B2DRectangle>()); void MarkAllObj(SdrPageView* pPV=nullptr); // pPage=NULL => all displayed pages void UnmarkAllObj(SdrPageView const * pPV=nullptr); // pPage=NULL => all displayed pages diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 4871df93b629..31f2d0373154 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -46,6 +46,7 @@ #include <sdr/overlay/overlayrollingrectangle.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdr/table/tablecontroller.hxx> +#include <svx/sdr/overlay/overlayselection.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/sdrpagewindow.hxx> @@ -130,6 +131,38 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition } } +class MarkingSubSelectionOverlay +{ + sdr::overlay::OverlayObjectList maObjects; + +public: + MarkingSubSelectionOverlay(const SdrPaintView& rView, std::vector<basegfx::B2DRectangle> const & rSelections) + { + if (comphelper::LibreOfficeKit::isActive()) + return; // We do client-side object manipulation with the Kit API + + for (sal_uInt32 a(0); a < rView.PaintWindowCount(); a++) + { + SdrPaintWindow* pCandidate = rView.GetPaintWindow(a); + const rtl::Reference<sdr::overlay::OverlayManager>& xTargetOverlay = pCandidate->GetOverlayManager(); + + if (xTargetOverlay.is()) + { + const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer; + const Color aHighlightColor = aSvtOptionsDrawinglayer.getHilightColor(); + + std::unique_ptr<sdr::overlay::OverlaySelection> pNew = + std::make_unique<sdr::overlay::OverlaySelection>( + sdr::overlay::OverlayType::Transparent, + aHighlightColor, rSelections, false); + + xTargetOverlay->add(*pNew); + maObjects.append(std::move(pNew)); + } + } + } +}; + // MarkView @@ -674,6 +707,8 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell) SdrHdlKind eSaveKind(SdrHdlKind::Move); SdrObject* pSaveObj = nullptr; + mpMarkingSubSelectionOverlay.reset(); + if(pSaveOldFocusHdl && pSaveOldFocusHdl->GetObj() && dynamic_cast<const SdrPathObj*>(pSaveOldFocusHdl->GetObj()) != nullptr @@ -774,6 +809,11 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell) { return; } + + if (!maSubSelectionList.empty()) + { + mpMarkingSubSelectionOverlay = std::make_unique<MarkingSubSelectionOverlay>(*this, maSubSelectionList); + } } tools::Rectangle aRect(GetMarkedObjRect()); @@ -1900,7 +1940,8 @@ void collectUIInformation(SdrObject* pObj) } -void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark, bool bImpNoSetMarkHdl) +void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark, bool bDoNoSetMarkHdl, + std::vector<basegfx::B2DRectangle> const & rSubSelections) { if (pObj!=nullptr && pPV!=nullptr && IsObjMarkable(pObj, pPV)) { BrkAction(); @@ -1917,7 +1958,10 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark, bool GetMarkedObjectListWriteAccess().DeleteMark(nPos); } } - if (!bImpNoSetMarkHdl) { + + maSubSelectionList = rSubSelections; + + if (!bDoNoSetMarkHdl) { MarkListHasChanged(); AdjustMarkHdl(); } |