Fix
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:656:11: warning: unused variable 'icon_width_with_spacing' [-Wunused-variable] ../src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp:57:10: warning: 'finalize' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] ../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:1381:35: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ../src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp:102:23: warning: unused variable 'border' [-Wunused-variable]
This commit is contained in:
parent
8e40501e0e
commit
5d7144cf29
@ -653,7 +653,6 @@ void GLGizmoEmboss::initialize()
|
|||||||
// make size pair number
|
// make size pair number
|
||||||
if (cfg.icon_width % 2 != 0) ++cfg.icon_width;
|
if (cfg.icon_width % 2 != 0) ++cfg.icon_width;
|
||||||
|
|
||||||
float icon_width_with_spacing = cfg.icon_width + space;
|
|
||||||
cfg.delete_pos_x = cfg.max_font_name_width + space;
|
cfg.delete_pos_x = cfg.max_font_name_width + space;
|
||||||
int count_line_of_text = 3;
|
int count_line_of_text = 3;
|
||||||
cfg.text_size = ImVec2(-FLT_MIN, line_height_with_spacing * count_line_of_text);
|
cfg.text_size = ImVec2(-FLT_MIN, line_height_with_spacing * count_line_of_text);
|
||||||
@ -1378,7 +1377,7 @@ void GLGizmoEmboss::draw_font_list()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ImGui::IsItemHovered())
|
if (ImGui::IsItemHovered())
|
||||||
ImGui::SetTooltip(face_name.ToUTF8().data());
|
ImGui::SetTooltip("%s", face_name.ToUTF8().data());
|
||||||
if (is_selected) ImGui::SetItemDefaultFocus();
|
if (is_selected) ImGui::SetItemDefaultFocus();
|
||||||
if (!m_face_names.exist_textures[index] &&
|
if (!m_face_names.exist_textures[index] &&
|
||||||
ImGui::IsItemVisible()) {
|
ImGui::IsItemVisible()) {
|
||||||
|
@ -35,7 +35,7 @@ struct FontImageData
|
|||||||
|
|
||||||
// texture meta data
|
// texture meta data
|
||||||
GLenum format = GL_ALPHA, type = GL_UNSIGNED_BYTE;
|
GLenum format = GL_ALPHA, type = GL_UNSIGNED_BYTE;
|
||||||
GLint level = 0, border = 0;
|
GLint level = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -59,7 +59,7 @@ public:
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="canceled"></param>
|
/// <param name="canceled"></param>
|
||||||
/// <param name=""></param>
|
/// <param name=""></param>
|
||||||
void finalize(bool canceled, std::exception_ptr &);
|
void finalize(bool canceled, std::exception_ptr &) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Slic3r::GUI
|
} // namespace Slic3r::GUI
|
||||||
|
Loading…
Reference in New Issue
Block a user