From b4c6ec10689ce90795c14eaff29de665fee10fb7 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Mon, 15 Apr 2024 16:43:42 +0200 Subject: [PATCH] SPE-2199 - Add .jpg in ScalableBitmap + TopBar: Set correct size for "user" icon --- src/slic3r/GUI/TopBar.cpp | 4 ++-- src/slic3r/GUI/wxExtensions.cpp | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/TopBar.cpp b/src/slic3r/GUI/TopBar.cpp index 584ec91965..6b1d00c32a 100644 --- a/src/slic3r/GUI/TopBar.cpp +++ b/src/slic3r/GUI/TopBar.cpp @@ -301,10 +301,10 @@ void TopBarItemsCtrl::UpdateAccountMenu(bool avatar/* = false*/) if (new_logo.IsOk()) m_account_btn->SetBitmapBundle(new_logo.bmp()); else - m_account_btn->SetBitmapBundle(*get_bmp_bundle("user")); + m_account_btn->SetBitmapBundle(*get_bmp_bundle("user", 24)); } else { - m_account_btn->SetBitmapBundle(*get_bmp_bundle("user")); + m_account_btn->SetBitmapBundle(*get_bmp_bundle("user", 24)); } } #endif diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index 3c91189bee..ef70cdf9ae 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -860,6 +860,11 @@ ScalableBitmap::ScalableBitmap(wxWindow* parent, boost::filesystem::path& icon_p wxBitmap::Rescale(bitmap, icon_size); m_bmp = wxBitmapBundle(bitmap); } + else if (ext == ".jpg") { + bitmap.LoadFile(path, wxBITMAP_TYPE_JPEG); + wxBitmap::Rescale(bitmap, icon_size); + m_bmp = wxBitmapBundle(bitmap); + } else if (ext == ".svg") { m_bmp = wxBitmapBundle::FromSVGFile(path, icon_size); }