3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-01 21:21:10 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

ENH:adjust assembly view toolbar UI (STUDIO-1213)

Browse source 
https://jira.bambooolab.com/browse/STUDIO-1213

Change-Id: I3b17b37a229348d347f56d0672f2c258fbeb91e1
This commit is contained in:
liz.li 2023-02-24 12:19:18 +08:00 • committed by Lane.Wei
parent ffc4e7080c
commit 9b47255bc1
5 changed files with 98 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/imgui/imgui_draw.cpp
View file

@ -3815,7 +3815,7 @@ void ImGui::RenderArrow(ImDrawList* draw_list, ImVec2 pos, ImU32 col, ImGuiDir d
draw_list->AddTriangleFilled(center + a, center + b, center + c, col);
}
void ImGui::BBLRenderArrow(ImDrawList *draw_list, ImVec2 pos, ImU32 col, ImGuiDir dir, float scale)
void ImGui::BBLRenderArrow(ImDrawList *draw_list, ImVec2 pos, ImU32 col, ImGuiDir dir, float thickness, float scale)
{
const float h = draw_list->_Data->FontSize * 1.00f;
float r = h * 0.40f * scale;
@ -3841,8 +3841,8 @@ void ImGui::BBLRenderArrow(ImDrawList *draw_list, ImVec2 pos, ImU32 col, ImGuiDi
case ImGuiDir_COUNT: IM_ASSERT(0); break;
}
//draw_list->AddTriangleFilled(center + a, center + b, center + c, col);
draw_list->AddLine(center + a, center + c,col);
draw_list->AddLine(center + a, center + b,col);
draw_list->AddLine(center + a, center + c, col, thickness);
draw_list->AddLine(center + a, center + b, col, thickness);
}
void ImGui::RenderBullet(ImDrawList* draw_list, ImVec2 pos, ImU32 col)

2
src/imgui/imgui_internal.h
View file

@ -2528,7 +2528,7 @@ namespace ImGui
// Render helpers (those functions don't access any ImGui state!)
IMGUI_API void RenderArrow(ImDrawList* draw_list, ImVec2 pos, ImU32 col, ImGuiDir dir, float scale = 1.0f);
IMGUI_API void BBLRenderArrow(ImDrawList* draw_list, ImVec2 pos, ImU32 col, ImGuiDir dir, float scale = 1.0f);
IMGUI_API void BBLRenderArrow(ImDrawList* draw_list, ImVec2 pos, ImU32 col, ImGuiDir dir, float thickness = 1.0f, float scale = 1.0f);
IMGUI_API void RenderBullet(ImDrawList* draw_list, ImVec2 pos, ImU32 col);
IMGUI_API void RenderCheckMark(ImDrawList* draw_list, ImVec2 pos, ImU32 col, float sz);
IMGUI_API void RenderMouseCursor(ImDrawList* draw_list, ImVec2 pos, float scale, ImGuiMouseCursor mouse_cursor, ImU32 col_fill, ImU32 col_border, ImU32 col_shadow);