juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-14 00:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev/h2d

Browse Source
This commit is contained in:
Noisyfox
2025-10-18 19:20:09 +08:00
committed by GitHub
parent 712febf3fb f12602c0bc
commit 01c02051f2
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GCodeViewer.cpp
View File

@@ -4817,7 +4817,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
ImGui::SameLine(checkbox_pos); ImGui::SameLine(checkbox_pos);
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0, 0.0)); // ensure no padding active ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0, 0.0)); // ensure no padding active
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0.0, 0.0)); // ensure no item spacing active ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0.0, 0.0)); // ensure no item spacing active
ImGui::Text(into_u8(visible ? ImGui::VisibleIcon : ImGui::HiddenIcon).c_str(), ImVec2(16 * m_scale, 16 * m_scale)); ImGui::Text("%s", into_u8(visible ? ImGui::VisibleIcon : ImGui::HiddenIcon).c_str());
ImGui::PopStyleVar(2); ImGui::PopStyleVar(2);
} }
} }

4
src/slic3r/GUI/ImGuiWrapper.cpp
View File

@@ -1059,6 +1059,10 @@ void ImGuiWrapper::tooltip(const char *label, float wrap_width)
ImGui::EndTooltip(); ImGui::EndTooltip();
} }
void ImGuiWrapper::tooltip(const std::string &label, float wrap_width) {
tooltip(label.c_str(), wrap_width);
}
void ImGuiWrapper::tooltip(const wxString &label, float wrap_width) void ImGuiWrapper::tooltip(const wxString &label, float wrap_width)
{ {
ImGui::BeginTooltip(); ImGui::BeginTooltip();

1
src/slic3r/GUI/ImGuiWrapper.hpp
View File

@@ -154,6 +154,7 @@ public:
void text_wrapped(const std::string &label, float wrap_width); void text_wrapped(const std::string &label, float wrap_width);
void text_wrapped(const wxString &label, float wrap_width); void text_wrapped(const wxString &label, float wrap_width);
void tooltip(const char *label, float wrap_width); void tooltip(const char *label, float wrap_width);
void tooltip(const std::string &label, float wrap_width);
void tooltip(const wxString &label, float wrap_width); void tooltip(const wxString &label, float wrap_width);
void filament_group(const std::string &filament_type, const char *hex_color, unsigned char filament_id, float align_width); void filament_group(const std::string &filament_type, const char *hex_color, unsigned char filament_id, float align_width);