mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no longer need this svtools/drawinglayer hack

Browse Source 
after
    commit 664ecbd891
    Author: Noel Grandin <noelgrandin@gmail.com>
    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 <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
This commit is contained in:
Noel Grandin
2024-11-21 11:51:05 +02:00
parent d22d862ce6
commit 08143bf192
3 changed files with 11 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drawinglayer/source/geometry/viewinformation2d.cxx
View File

@@ -48,12 +48,6 @@ constexpr OUStringLiteral g_PropertyName_UseAntiAliasing = u"UseAntiAliasing";
constexpr OUStringLiteral g_PropertyName_PixelSnapHairline = u"PixelSnapHairline"; constexpr OUStringLiteral g_PropertyName_PixelSnapHairline = u"PixelSnapHairline";
} }
namespace
{
bool bForwardsAreInitialized(false);
bool bForwardPixelSnapHairline(true);
}
class ImpViewInformation2D class ImpViewInformation2D
{ {
private: private:
@@ -123,8 +117,13 @@ public:
, mbEditViewActive(false) , mbEditViewActive(false)
, mbReducedDisplayQuality(false) , mbReducedDisplayQuality(false)
, mbUseAntiAliasing(ViewInformation2D::getGlobalAntiAliasing()) , 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; } const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; }
@@ -250,18 +249,11 @@ ViewInformation2D::ImplType& theGlobalDefault()
ViewInformation2D::ViewInformation2D() ViewInformation2D::ViewInformation2D()
: mpViewInformation2D(theGlobalDefault()) : mpViewInformation2D(theGlobalDefault())
{ {
if (!bForwardsAreInitialized)
{
bForwardsAreInitialized = true;
if (!comphelper::IsFuzzing())
{
bForwardPixelSnapHairline
= officecfg::Office::Common::Drawinglayer::SnapHorVerLinesToDiscrete::get();
}
}
setUseAntiAliasing(ViewInformation2D::getGlobalAntiAliasing()); setUseAntiAliasing(ViewInformation2D::getGlobalAntiAliasing());
setPixelSnapHairline(bForwardPixelSnapHairline); if (!comphelper::IsFuzzing())
setPixelSnapHairline(
getUseAntiAliasing()
&& officecfg::Office::Common::Drawinglayer::SnapHorVerLinesToDiscrete::get());
} }
ViewInformation2D::ViewInformation2D(const ViewInformation2D&) = default; ViewInformation2D::ViewInformation2D(const ViewInformation2D&) = default;
@@ -427,11 +419,6 @@ void ViewInformation2D::setGlobalAntiAliasing(bool bAntiAliasing, bool bTemporar
} }
bool ViewInformation2D::getGlobalAntiAliasing() { return globalAntiAliasing(); } bool ViewInformation2D::getGlobalAntiAliasing() { return globalAntiAliasing(); }
void ViewInformation2D::forwardPixelSnapHairline(bool bPixelSnapHairline)
{
bForwardPixelSnapHairline = bPixelSnapHairline;
}
ViewInformation2D ViewInformation2D
createViewInformation2D(const css::uno::Sequence<css::beans::PropertyValue>& rViewParameters) createViewInformation2D(const css::uno::Sequence<css::beans::PropertyValue>& rViewParameters)
{ {

1
include/drawinglayer/geometry/viewinformation2d.hxx
View File

@@ -173,7 +173,6 @@ public:
static void setGlobalAntiAliasing(bool bAntiAliasing, bool bTemporary); static void setGlobalAntiAliasing(bool bAntiAliasing, bool bTemporary);
static bool getGlobalAntiAliasing(); static bool getGlobalAntiAliasing();
static void forwardPixelSnapHairline(bool bPixelSnapHairline);
}; };
DRAWINGLAYERCORE_DLLPUBLIC ViewInformation2D DRAWINGLAYERCORE_DLLPUBLIC ViewInformation2D

14
svtools/source/config/optionsdrawinglayer.cxx
View File

@@ -43,9 +43,6 @@ Color GetStripeColorB()
return Color(ColorTransparency, officecfg::Office::Common::Drawinglayer::StripeColorB::get()); return Color(ColorTransparency, officecfg::Office::Common::Drawinglayer::StripeColorB::get());
} }
static bool gbPixelSnapHairlineForwardInitial(false);
static bool gbPixelSnapHairlineForwardLast(true);
bool IsAntiAliasing() bool IsAntiAliasing()
{ {
return drawinglayer::geometry::ViewInformation2D::getGlobalAntiAliasing(); return drawinglayer::geometry::ViewInformation2D::getGlobalAntiAliasing();
@@ -64,16 +61,7 @@ void SetAntiAliasing( bool bOn, bool bTemporary )
bool IsSnapHorVerLinesToDiscrete() bool IsSnapHorVerLinesToDiscrete()
{ {
const bool bRetval(IsAntiAliasing() && officecfg::Office::Common::Drawinglayer::SnapHorVerLinesToDiscrete::get()); return IsAntiAliasing() && officecfg::Office::Common::Drawinglayer::SnapHorVerLinesToDiscrete::get();
if (!gbPixelSnapHairlineForwardInitial || gbPixelSnapHairlineForwardLast != bRetval)
{
gbPixelSnapHairlineForwardInitial = true;
gbPixelSnapHairlineForwardLast = bRetval;
drawinglayer::geometry::ViewInformation2D::forwardPixelSnapHairline(bRetval);
}
return bRetval;
} }
sal_uInt16 GetTransparentSelectionPercent() sal_uInt16 GetTransparentSelectionPercent()