commit 5346168fa919ad98224c4d2079e738a4d0b8d164
author Caolán McNamara <caolanm@redhat.com> Wed Dec 01 20:42:47 2021 +0000
committer Caolán McNamara <caolanm@redhat.com> Thu Dec 02 23:20:55 2021 +0100
tree ba0e867e54eed3f47ed67cb660fad99d72ceaf84
parent 37892b97d00de29a86c735aaaff47c12e66e78ad

undo "allow vcl gen menus to have non-square images"

This reverts commit 06f36cc7ca8fc056dd8cf4d8cdbe682f9a003cef

ended up not using this so don't need the extra complexity

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

vcl/source/window/menu.cxx

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 7df1de1..68e01be8 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1422,8 +1422,6 @@ void Menu::ImplRemoveDel( ImplMenuDelData& rDel )
    }
}

constexpr int ImageBorder = 4;

Size Menu::ImplCalcSize( vcl::Window* pWin )
{
    // | Check/Radio/Image| Text| Accel/Popup|
@@ -1490,8 +1488,8 @@ Size Menu::ImplCalcSize( vcl::Window* pWin )
            {
                Size aImgSz = pData->aImage.GetSizePixel();

                aImgSz.AdjustHeight(ImageBorder); // add a border for native marks
                aImgSz.AdjustWidth(ImageBorder); // add a border for native marks
                aImgSz.AdjustHeight(4 ); // add a border for native marks
                aImgSz.AdjustWidth(4 ); // add a border for native marks
                if ( aImgSz.Width() > aMaxImgSz.Width() )
                    aMaxImgSz.setWidth( aImgSz.Width() );
                if ( aImgSz.Height() > aMaxImgSz.Height() )
@@ -1923,16 +1921,12 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext, Size const & rSize,
                // Image:
                if (!bLayout && !IsMenuBar() && ((pData->eType == MenuItemType::IMAGE) || (pData->eType == MenuItemType::STRINGIMAGE)))
                {
                    Image aImage = pData->aImage;

                    auto nImgWidth = aImage.GetSizePixel().Width() + ImageBorder;
                    if (nImgWidth > aOuterCheckRect.GetWidth())
                        aOuterCheckRect.setWidth(nImgWidth);

                    // Don't render an image for a check thing
                    if (pData->bChecked)
                        ImplPaintCheckBackground(rRenderContext, *pWindow, aOuterCheckRect, pThisItemOnly && bHighlighted);

                    Image aImage = pData->aImage;

                    aTmpPos = aOuterCheckRect.TopLeft();
                    aTmpPos.AdjustX((aOuterCheckRect.GetWidth() - aImage.GetSizePixel().Width()) / 2 );
                    aTmpPos.AdjustY((aOuterCheckRect.GetHeight() - aImage.GetSizePixel().Height()) / 2 );