GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-20 21:39:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fs_fix_SPE-2097' into master_27x

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2024-01-18 13:09:27 +01:00
commit 82c53aef01
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View File

@ -3606,7 +3606,7 @@ GuiCfg create_gui_configuration()
float space = line_height_with_spacing - line_height; float space = line_height_with_spacing - line_height;
const ImGuiStyle &style = ImGui::GetStyle(); const ImGuiStyle &style = ImGui::GetStyle();
cfg.max_style_name_width = ImGui::CalcTextSize("Maximal font name, extended").x; cfg.max_style_name_width = ImGui::CalcTextSize("Maximal style name..").x;
cfg.icon_width = static_cast<unsigned int>(std::ceil(line_height)); cfg.icon_width = static_cast<unsigned int>(std::ceil(line_height));
// make size pair number // make size pair number
@ -3725,11 +3725,11 @@ GuiCfg create_gui_configuration()
ImVec2(cfg.minimal_window_size_with_advance.x, ImVec2(cfg.minimal_window_size_with_advance.x,
cfg.minimal_window_size_with_advance.y + input_height); cfg.minimal_window_size_with_advance.y + input_height);
int max_style_image_width = static_cast<int>(std::round(cfg.max_style_name_width/2 - 2 * style.FramePadding.x)); int max_style_image_width = static_cast<int>(std::round(cfg.max_style_name_width - 2 * style.FramePadding.x));
int max_style_image_height = static_cast<int>(std::round(1.5 * input_height)); int max_style_image_height = static_cast<int>(std::round(1.5 * input_height));
cfg.max_style_image_size = Vec2i(max_style_image_width, max_style_image_height); cfg.max_style_image_size = Vec2i(max_style_image_width, max_style_image_height);
cfg.face_name_size = Vec2i(cfg.input_width, 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; cfg.face_name_texture_offset_x = cfg.face_name_size.x() + style.WindowPadding.x + space;
return cfg; return cfg;
} }
} // namespace } // namespace

5
src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp
View File

@ -146,8 +146,9 @@ void CreateFontImageJob::finalize(bool canceled, std::exception_ptr &)
glsafe(::glBindTexture(target, m_input.texture_id)); glsafe(::glBindTexture(target, m_input.texture_id));
GLsizei w = m_tex_size.x(), h = m_tex_size.y(); GLsizei w = m_tex_size.x(), h = m_tex_size.y();
GLint xoffset = m_input.size.x() - m_tex_size.x(), // arrange right GLint xoffset = 0; // align to left
yoffset = m_input.size.y() * m_input.index; // GLint xoffset = m_input.size.x() - m_tex_size.x(); // align right
GLint yoffset = m_input.size.y() * m_input.index;
glsafe(::glTexSubImage2D(target, m_input.level, xoffset, yoffset, w, h, glsafe(::glTexSubImage2D(target, m_input.level, xoffset, yoffset, w, h,
m_input.format, m_input.type, m_result.data())); m_input.format, m_input.type, m_result.data()));

4
src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp
View File

@ -46,12 +46,12 @@ void CreateFontStyleImagesJob::process(Ctl &ctl)
// create image description // create image description
StyleManager::StyleImage &image = m_images[index]; StyleManager::StyleImage &image = m_images[index];
BoundingBox &bounding_box = image.bounding_box; BoundingBox &bounding_box = image.bounding_box;
for (ExPolygon &shape : shapes) for (const ExPolygon &shape : shapes)
bounding_box.merge(BoundingBox(shape.contour.points)); bounding_box.merge(BoundingBox(shape.contour.points));
for (ExPolygon &shape : shapes) shape.translate(-bounding_box.min); for (ExPolygon &shape : shapes) shape.translate(-bounding_box.min);
// calculate conversion from FontPoint to screen pixels by size of font // calculate conversion from FontPoint to screen pixels by size of font
double scale = get_text_shape_scale(item.prop, *item.font.font_file); double scale = get_text_shape_scale(item.prop, *item.font.font_file) * m_input.ppm;
scales[index] = scale; scales[index] = scale;
//double scale = font_prop.size_in_mm * SCALING_FACTOR; //double scale = font_prop.size_in_mm * SCALING_FACTOR;