commit 47ad7497f736b27c23667e0754cd686b78b60744
author Caolán McNamara <caolanm@redhat.com> Wed Mar 10 17:02:46 2021 +0000
committer Caolán McNamara <caolanm@redhat.com> Thu Mar 11 14:28:34 2021 +0100
tree f1d68e9db3dfce6d8282660b3807b7666d4904fe
parent 1692998399eecb79e7b59456cff805bcb77aece4

tdf#140934 update annotation menubutton bg when comment color changes

Change-Id: Ia4d10a8f19c039655dbe28c5f612061ce3755afa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112278
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

sw/inc/AnnotationWin.hxx

diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 15dc3e1..f1ba8a4 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -221,6 +221,8 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public InterimItemWindow

        SvxLanguageItem GetLanguage() const;

        void SetMenuButtonColors();

        SwPostItMgr&    mrMgr;
        SwView&         mrView;

sw/source/uibase/docvw/AnnotationWin2.cxx

diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index b3e3617..2c82afe 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -441,6 +441,33 @@ static Color ColorFromAlphaColor(const sal_uInt8 aTransparency, const Color& aFr
                 sal_uInt8(aFront.GetBlue()  * aTransparency / 255.0 + aBack.GetBlue()  * (1 - aTransparency / 255.0)));
}

void SwAnnotationWin::SetMenuButtonColors()
{
    if (!mxMenuButton)
        return;

    mxMenuButton->set_background(mColorDark);

    const Fraction& rFraction = mrView.GetWrtShellPtr()->GetOut()->GetMapMode().GetScaleY();

    ScopedVclPtrInstance<VirtualDevice> xVirDev;
    Size aSize(tools::Long(METABUTTON_WIDTH * rFraction),
               tools::Long(METABUTTON_HEIGHT * rFraction));
    tools::Rectangle aRect(Point(0, 0), aSize);
    xVirDev->SetOutputSizePixel(aSize);

    Gradient aGradient(GradientStyle::Linear,
                             ColorFromAlphaColor(15, mColorAnchor, mColorDark),
                             ColorFromAlphaColor(80, mColorAnchor, mColorDark));
    xVirDev->DrawGradient(aRect, aGradient);

    DecorationView aDecoView(xVirDev.get());
    aDecoView.DrawSymbol(aRect, SymbolType::SPIN_DOWN, GetTextColor(),
                         DrawSymbolFlags::NONE);
    mxMenuButton->set_image(xVirDev);
    mxMenuButton->set_size_request(aSize.Width() + 4, aSize.Height());
}

void SwAnnotationWin::Rescale()
{
    // On Android, this method leads to invoke ImpEditEngine::UpdateViews
@@ -468,25 +495,7 @@ void SwAnnotationWin::Rescale()
        mxMetadataDate->set_font(aFont);
    if (mxMetadataResolved)
        mxMetadataResolved->set_font(aFont);
    if (mxMenuButton)
    {
        ScopedVclPtrInstance<VirtualDevice> xVirDev;
        Size aSize(tools::Long(METABUTTON_WIDTH * rFraction),
                   tools::Long(METABUTTON_HEIGHT * rFraction));
        tools::Rectangle aRect(Point(0, 0), aSize);
        xVirDev->SetOutputSizePixel(aSize);

        Gradient aGradient(GradientStyle::Linear,
                                 ColorFromAlphaColor(15, mColorAnchor, mColorDark),
                                 ColorFromAlphaColor(80, mColorAnchor, mColorDark));
        xVirDev->DrawGradient(aRect, aGradient);

        DecorationView aDecoView(xVirDev.get());
        aDecoView.DrawSymbol(aRect, SymbolType::SPIN_DOWN, GetTextColor(),
                             DrawSymbolFlags::NONE);
        mxMenuButton->set_image(xVirDev);
        mxMenuButton->set_size_request(aSize.Width() + 4, aSize.Height());
    }
    SetMenuButtonColors();
    if (mxVScrollbar)
        mxVScrollbar->set_scroll_thickness(GetPrefScrollbarWidth());
}
@@ -835,7 +844,7 @@ void SwAnnotationWin::SetColor(Color aColorDark,Color aColorLight, Color aColorA
        return;

    m_xContainer->set_background(mColorDark);
    mxMenuButton->set_background(mColorDark);
    SetMenuButtonColors();

    mxMetadataAuthor->set_font_color(aColorAnchor);