From 5cc8e34dfbb6dff37a97013e39ab7c324a287317 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 19 Feb 2022 23:13:40 +0100 Subject: [PATCH] Fix completely broken code in the parent commit This was accidentally committed without being tested, correct it now. See #22138. --- src/unix/taskbarx11.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp index d4d729d228..6c64fc7f7f 100644 --- a/src/unix/taskbarx11.cpp +++ b/src/unix/taskbarx11.cpp @@ -137,8 +137,11 @@ void wxTaskBarIconArea::SetTrayIcon(const wxBitmapBundle& bmp) m_bmp = bmp; // determine suitable bitmap size: - wxSize iconsize = m_bmp.GetDefaultSize().DecTo(GetClientSize()); - m_bmpReal = m_bmp.GetBitmapFor(iconsize); + const wxSize winsize = GetClientSize(); + wxSize iconsize(m_bmp.GetDefaultSize()); + iconsize.DecTo(winsize); + + m_bmpReal = m_bmp.GetBitmap(iconsize); wxRegion region; region.Union(m_bmpReal);