3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-11 16:00:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

remove GetBmpSize method from DropDown.cpp

Browse source
This commit is contained in:
Ocraftyone 2023-11-08 11:08:38 -05:00
parent 92c9a537d8
commit 7cfa854981
No known key found for this signature in database
GPG key ID: 85836ED21AD4D125
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/slic3r/GUI/Widgets/DropDown.cpp
View file

@ -187,15 +187,6 @@ void DropDown::paintNow()
Refresh(); Refresh();
} }
static wxSize GetBmpSize(wxBitmap & bmp)
{
#ifdef __APPLE__
return bmp.GetScaledSize();
#else
return bmp.GetSize();
#endif
}
/* /*
* Here we do the actual rendering. I put it in a separate * Here we do the actual rendering. I put it in a separate
* method so that it can work no matter what type of DC * method so that it can work no matter what type of DC
@ -337,7 +328,7 @@ void DropDown::messureSize()
wxSize szContent = textSize; wxSize szContent = textSize;
szContent.x += 10; szContent.x += 10;
if (check_bitmap.bmp().IsOk()) { if (check_bitmap.bmp().IsOk()) {
auto szBmp = check_bitmap.GetBmpSize(); auto szBmp = check_bitmap.GetSize();
szContent.x += szBmp.x + 5; szContent.x += szBmp.x + 5;
} }
if (iconSize.x > 0) szContent.x += iconSize.x + (text_off ? 0 : 5); if (iconSize.x > 0) szContent.x += iconSize.x + (text_off ? 0 : 5);