diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp index 8ac874a631..67cd0281df 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp @@ -261,9 +261,8 @@ struct GuiCfg ImVec2 text_size; // maximal size of face name image - Vec2i face_name_size = Vec2i(100, 0); - float face_name_max_width = 100.f; - float face_name_texture_offset_x = 105.f; + Vec2i face_name_size = Vec2i(0, 0); + float face_name_texture_offset_x = 0.f; // maximal texture generate jobs running at once unsigned int max_count_opened_font_files = 10; @@ -3633,8 +3632,8 @@ GuiCfg create_gui_configuration() tr.use_surface = _u8L("Use surface"); // TRN - Input label. Be short as possible // Option to change projection on curved surface - // for each character in text separately - tr.per_glyph = _u8L("Per glyph orientation"); + // for each character(glyph) in text separately + tr.per_glyph = _u8L("Per glyph"); // TRN - Input label. Be short as possible // Align Top|Middle|Bottom and Left|Center|Right tr.alignment = _u8L("Alignment"); @@ -3719,7 +3718,8 @@ GuiCfg create_gui_configuration() int max_style_image_width = static_cast(std::round(cfg.max_style_name_width/2 - 2 * style.FramePadding.x)); int max_style_image_height = static_cast(std::round(1.5 * input_height)); cfg.max_style_image_size = Vec2i(max_style_image_width, max_style_image_height); - cfg.face_name_size.y() = line_height_with_spacing; + cfg.face_name_size = Vec2i(cfg.input_width, line_height_with_spacing); + cfg.face_name_texture_offset_x = cfg.face_name_size.x() + space; return cfg; } } // namespace diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp index 96db06a027..95f72c971e 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp @@ -2022,7 +2022,7 @@ GuiCfg create_gui_configuration() { float separator_height = 2 + style.FramePadding.y; float window_height = window_title + // window title - cfg.texture_max_size_px + 2 * style.FramePadding.y + // preview + cfg.texture_max_size_px + 2 * style.FramePadding.y + // preview (-- not sure with padding -> fix retina height) line_height_with_spacing + // filename separator_height + // separator - orange line input_height * 7 + // depth + size + use_surface + FromSurface + Rotation + Mirror + FaceTheCamera