mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-22 04:35:17 +00:00
remove GetBmpSize method from DropDown.cpp
This commit is contained in:
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user