juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:Picture text adaptive height for combobox menu

Browse Source 
jira: STUDIO-11330
Change-Id: I5948dad4811747258b96e6ac1bf95379640c9cd4
(cherry picked from commit 4824f1f5ce76bc28502cd3fc8de97e082e6f3ad1)
This commit is contained in:
zhou.xu
2025-04-03 17:17:01 +08:00
committed by Noisyfox
parent 5004fbbf60
commit c3e0456017
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/slic3r/GUI/wxExtensions.cpp
View File

@@ -17,7 +17,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;
@@ -572,6 +572,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;