drawinglayer/source/geometry/viewinformation2d.cxx | 33 ++++++-------------- include/drawinglayer/geometry/viewinformation2d.hxx | 1 svtools/source/config/optionsdrawinglayer.cxx | 14 -------- 3 files changed, 11 insertions(+), 37 deletions(-)
New commits: commit 08143bf192a885e1adbde061bb7d68bc5c559e03 Author: Noel Grandin <[email protected]> AuthorDate: Thu Nov 21 11:51:05 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Nov 21 14:31:49 2024 +0100 no longer need this svtools/drawinglayer hack after commit 664ecbd8916478cdc28a9c793fbdb9359b3cac64 Author: Noel Grandin <[email protected]> Date: Wed Nov 20 16:08:14 2024 +0200 remove OutDevSupportType::TransparentRect Change-Id: I57804ec9e9967c7082a1f657165d967d75b1dedf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176910 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx index 296e34a0def2..6550831214db 100644 --- a/drawinglayer/source/geometry/viewinformation2d.cxx +++ b/drawinglayer/source/geometry/viewinformation2d.cxx @@ -48,12 +48,6 @@ constexpr OUStringLiteral g_PropertyName_UseAntiAliasing = u"UseAntiAliasing"; constexpr OUStringLiteral g_PropertyName_PixelSnapHairline = u"PixelSnapHairline"; } -namespace -{ -bool bForwardsAreInitialized(false); -bool bForwardPixelSnapHairline(true); -} - class ImpViewInformation2D { private: @@ -123,8 +117,13 @@ public: , mbEditViewActive(false) , mbReducedDisplayQuality(false) , mbUseAntiAliasing(ViewInformation2D::getGlobalAntiAliasing()) - , mbPixelSnapHairline(mbUseAntiAliasing && bForwardPixelSnapHairline) { + if (comphelper::IsFuzzing()) + mbPixelSnapHairline = false; + else + mbPixelSnapHairline + = mbUseAntiAliasing + && officecfg::Office::Common::Drawinglayer::SnapHorVerLinesToDiscrete::get(); } const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; } @@ -250,18 +249,11 @@ ViewInformation2D::ImplType& theGlobalDefault() ViewInformation2D::ViewInformation2D() : mpViewInformation2D(theGlobalDefault()) { - if (!bForwardsAreInitialized) - { - bForwardsAreInitialized = true; - if (!comphelper::IsFuzzing()) - { - bForwardPixelSnapHairline - = officecfg::Office::Common::Drawinglayer::SnapHorVerLinesToDiscrete::get(); - } - } - setUseAntiAliasing(ViewInformation2D::getGlobalAntiAliasing()); - setPixelSnapHairline(bForwardPixelSnapHairline); + if (!comphelper::IsFuzzing()) + setPixelSnapHairline( + getUseAntiAliasing() + && officecfg::Office::Common::Drawinglayer::SnapHorVerLinesToDiscrete::get()); } ViewInformation2D::ViewInformation2D(const ViewInformation2D&) = default; @@ -427,11 +419,6 @@ void ViewInformation2D::setGlobalAntiAliasing(bool bAntiAliasing, bool bTemporar } bool ViewInformation2D::getGlobalAntiAliasing() { return globalAntiAliasing(); } -void ViewInformation2D::forwardPixelSnapHairline(bool bPixelSnapHairline) -{ - bForwardPixelSnapHairline = bPixelSnapHairline; -} - ViewInformation2D createViewInformation2D(const css::uno::Sequence<css::beans::PropertyValue>& rViewParameters) { diff --git a/include/drawinglayer/geometry/viewinformation2d.hxx b/include/drawinglayer/geometry/viewinformation2d.hxx index 13d843aec15c..c86b7b7a9bf8 100644 --- a/include/drawinglayer/geometry/viewinformation2d.hxx +++ b/include/drawinglayer/geometry/viewinformation2d.hxx @@ -173,7 +173,6 @@ public: static void setGlobalAntiAliasing(bool bAntiAliasing, bool bTemporary); static bool getGlobalAntiAliasing(); - static void forwardPixelSnapHairline(bool bPixelSnapHairline); }; DRAWINGLAYERCORE_DLLPUBLIC ViewInformation2D diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index 277d716681f1..ff2740f17abf 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -43,9 +43,6 @@ Color GetStripeColorB() return Color(ColorTransparency, officecfg::Office::Common::Drawinglayer::StripeColorB::get()); } -static bool gbPixelSnapHairlineForwardInitial(false); -static bool gbPixelSnapHairlineForwardLast(true); - bool IsAntiAliasing() { return drawinglayer::geometry::ViewInformation2D::getGlobalAntiAliasing(); @@ -64,16 +61,7 @@ void SetAntiAliasing( bool bOn, bool bTemporary ) bool IsSnapHorVerLinesToDiscrete() { - const bool bRetval(IsAntiAliasing() && officecfg::Office::Common::Drawinglayer::SnapHorVerLinesToDiscrete::get()); - - if (!gbPixelSnapHairlineForwardInitial || gbPixelSnapHairlineForwardLast != bRetval) - { - gbPixelSnapHairlineForwardInitial = true; - gbPixelSnapHairlineForwardLast = bRetval; - drawinglayer::geometry::ViewInformation2D::forwardPixelSnapHairline(bRetval); - } - - return bRetval; + return IsAntiAliasing() && officecfg::Office::Common::Drawinglayer::SnapHorVerLinesToDiscrete::get(); } sal_uInt16 GetTransparentSelectionPercent()
