ENH:Picture text adaptive height for combobox menu
jira: STUDIO-11330 Change-Id: I5948dad4811747258b96e6ac1bf95379640c9cd4
This commit is contained in:
parent
b7ffba39e4
commit
4824f1f5ce
|
@ -26,7 +26,7 @@
|
|||
#include "BitmapComboBox.hpp"
|
||||
#include "Widgets/StaticBox.hpp"
|
||||
#include "Widgets/Label.hpp"
|
||||
|
||||
#include "../Utils/WxFontUtils.hpp"
|
||||
#ifndef __linux__
|
||||
// msw_menuitem_bitmaps is used for MSW and OSX
|
||||
static std::map<int, std::string> msw_menuitem_bitmaps;
|
||||
|
@ -583,6 +583,7 @@ wxBitmap *get_extruder_color_icon(std::string color, std::string label, int icon
|
|||
wxMemoryDC dc(&cdc);
|
||||
#endif
|
||||
dc.SetFont(::Label::Body_12);
|
||||
Slic3r::GUI::WxFontUtils::get_suitable_font_size(icon_height - 2, dc);
|
||||
dc.SelectObject(*bitmap);
|
||||
if (clr.Alpha() == 0) {
|
||||
int size = icon_height * 2;
|
||||
|
|
Loading…
Reference in New Issue