mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:Icon is not visible in boolean in mac 

jira: STUDIO-11056
Change-Id: I80d2b04a0d82655aaee7a83c2ee211f48d9e6b7e
This commit is contained in:
zhou.xu 2025-03-23 17:22:06 +08:00 committed by lane.wei
parent 5e1ffe3a2c
commit 4039cfd666
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp
View File

@ -326,11 +326,13 @@ void GLGizmoMeshBoolean::on_render_input_window(float x, float y, float bottom_l
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGui::GetStyleColorVec4(ImGuiCol_Button)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGui::GetStyleColorVec4(ImGuiCol_Button));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGui::GetStyleColorVec4(ImGuiCol_Button)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGui::GetStyleColorVec4(ImGuiCol_Button));
ImGui::PushStyleColor(ImGuiCol_Border, { 0, 0, 0, 0 }); ImGui::PushStyleColor(ImGuiCol_Border, { 0, 0, 0, 0 });
if (ImGui::Button((into_u8(ImGui::TextSearchCloseIcon) + "##src").c_str(), {18, 18})) ImGui::PushID("Source");
if (ImGui::Button(into_u8(ImGui::TextSearchCloseIcon).c_str()))
{ {
m_src.reset(); m_src.reset();
m_selecting_state = MeshBooleanSelectingState::SelectSource; m_selecting_state = MeshBooleanSelectingState::SelectSource;
} }
ImGui::PopID();
ImGui::PopStyleColor(5); ImGui::PopStyleColor(5);
} }
@ -355,11 +357,13 @@ void GLGizmoMeshBoolean::on_render_input_window(float x, float y, float bottom_l
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGui::GetStyleColorVec4(ImGuiCol_Button)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGui::GetStyleColorVec4(ImGuiCol_Button));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGui::GetStyleColorVec4(ImGuiCol_Button)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGui::GetStyleColorVec4(ImGuiCol_Button));
ImGui::PushStyleColor(ImGuiCol_Border, { 0, 0, 0, 0 }); ImGui::PushStyleColor(ImGuiCol_Border, { 0, 0, 0, 0 });
if (ImGui::Button((into_u8(ImGui::TextSearchCloseIcon) + "tool").c_str(), {18, 18})) ImGui::PushID("Tool");
if (ImGui::Button(into_u8(ImGui::TextSearchCloseIcon).c_str()))
{ {
m_tool.reset(); m_tool.reset();
m_selecting_state = (m_src.mv == nullptr) ? MeshBooleanSelectingState::SelectSource : MeshBooleanSelectingState::SelectTool; m_selecting_state = (m_src.mv == nullptr) ? MeshBooleanSelectingState::SelectSource : MeshBooleanSelectingState::SelectTool;
} }
ImGui::PopID();
ImGui::PopStyleColor(5); ImGui::PopStyleColor(5);
m_full_width = ImGui::GetWindowWidth(); m_full_width = ImGui::GetWindowWidth();
} else { } else {