mirror of https://github.com/BOINC/boinc.git
Compatibility fix for wxWidgets 3.1.5 wxBitmapCombo Box, which requires all bitmaps in a combo box to be the same size.
This commit is contained in:
parent
05a9ddab3b
commit
56ac9416fb
|
@ -551,30 +551,28 @@ wxBitmap* CSimpleProjectPanel::GetProjectSpecificBitmap(char* project_url) {
|
|||
wxBitmap* projectBM;
|
||||
wxString strIconPath = wxString(defaultIcnPath,wxConvUTF8);
|
||||
if (wxFile::Exists(strIconPath)) {
|
||||
#ifdef __WXMSW__
|
||||
if ((GetXDPIScaling() > 1.05) || (GetYDPIScaling() > 1.05)) {
|
||||
// wxBitmapComboBox requires all its bitmaps to be the same size
|
||||
// Our "project icon" bitmaps should all be 40 X 40
|
||||
wxImage img = wxImage(strIconPath, wxBITMAP_TYPE_ANY);
|
||||
if (img.IsOk()) {
|
||||
img.Rescale((int) (img.GetWidth()*GetXDPIScaling()),
|
||||
(int) (img.GetHeight()*GetYDPIScaling()),
|
||||
#ifdef __WXMSW__
|
||||
if ((GetXDPIScaling() > 1.05) || (GetYDPIScaling() > 1.05)) {
|
||||
img.Rescale((int) (40*GetXDPIScaling()),
|
||||
(int) (40*GetYDPIScaling()),
|
||||
wxIMAGE_QUALITY_BILINEAR
|
||||
);
|
||||
}
|
||||
#else
|
||||
if ((img.GetHeight() != 40) || (img.GetWidth() == 40)) {
|
||||
img.Rescale(40, 40, wxIMAGE_QUALITY_BILINEAR);
|
||||
}
|
||||
#endif
|
||||
projectBM = new wxBitmap(img);
|
||||
if (projectBM->IsOk()) {
|
||||
return projectBM;
|
||||
}
|
||||
}
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
projectBM = new wxBitmap();
|
||||
if ( projectBM->LoadFile(strIconPath, wxBITMAP_TYPE_ANY) ) {
|
||||
return projectBM;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return pSkinSimple->GetProjectImage()->GetBitmap();
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue