3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-30 21:00:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix:fix filament arrange ui

Browse source 
jira: nojira
Change-Id: I543c212d8e28f2701f8494f031c24090d9fe7617
(cherry picked from commit dcfc5af245d1cc27dfc8e1519dd3dfcbb2864af3)
This commit is contained in:
Mack 2025-02-20 17:50:13 +08:00 • committed by Noisyfox
parent e2a9aecb22
commit 61a68460bf
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/GCodeViewer.cpp
View file

@ -4519,7 +4519,7 @@ void GCodeViewer::render_legend_color_arr_recommen(float window_padding)
filament_group_item_align_width = max(filament_group_item_align_width, text_size.x);
text_line_height = max(text_line_height, text_size.y);
}
container_height += (three_words_width * 1.2f + text_line_height );
container_height += (three_words_width * 1.3f + text_line_height );
}
container_height += 2 * line_height;
ams_item_height = std::max(ams_item_height, container_height);
@ -4539,7 +4539,7 @@ void GCodeViewer::render_legend_color_arr_recommen(float window_padding)
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(.15f, .18f, .19f, 1.0f));
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(window_padding * 3, 0));
ImGui::Dummy({window_padding, window_padding});
// ImGui::Dummy({window_padding, window_padding});
ImGui::BeginChild("#AMS", ImVec2(0, AMS_container_height), true, ImGuiWindowFlags_AlwaysUseWindowPadding);
{
float available_width = ImGui::GetContentRegionAvail().x;
@ -6030,7 +6030,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
for (auto item : options_items)
append_option_item(item, offsets);
}
ImGui::Dummy({ window_padding, window_padding });
if (m_nozzle_nums > 1)
render_legend_color_arr_recommen(window_padding);