3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Extend advance height when font is collection

Browse source
This commit is contained in:
Filip Sykala - NTB T15p 2022-11-08 12:23:43 +01:00
parent 2886d26fa0
commit bf55f63c39
3 changed files with 10 additions and 3 deletions
src/slic3r/GUI/Gizmos
GLGizmoEmboss.cpp

10
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View file

@ -735,6 +735,10 @@ void GLGizmoEmboss::initialize()
ImVec2(cfg.minimal_window_size.x,
cfg.minimal_window_size.y + advance_height);
cfg.minimal_window_size_with_collections =
ImVec2(cfg.minimal_window_size_with_advance.x,
cfg.minimal_window_size_with_advance.y + input_height);
int max_style_image_width = cfg.max_style_name_width /2 -
2 * style.FramePadding.x;
int max_style_image_height = 1.5 * input_height;
@ -2811,9 +2815,9 @@ void GLGizmoEmboss::set_minimal_window_size(bool is_advance_edit_style)
const ImVec2 &GLGizmoEmboss::get_minimal_window_size() const
{
return m_is_advanced_edit_style ?
m_gui_cfg->minimal_window_size_with_advance :
m_gui_cfg->minimal_window_size;
return (!m_is_advanced_edit_style) ? m_gui_cfg->minimal_window_size :
((!m_style_manager.has_collections())? m_gui_cfg->minimal_window_size_with_advance :
m_gui_cfg->minimal_window_size_with_collections);
}
#ifdef ALLOW_ADD_FONT_BY_OS_SELECTOR