juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: color arrangement ui

Browse Source 
jira: STUDIO-8124
Change-Id: Ibcde0e002ffd652b350bd05a9453ce7aaefd7bca
(cherry picked from commit 65e3829f92ceb0bd2152ff255640453a8216cc0c)
This commit is contained in:
Mack
2024-09-25 21:56:40 +08:00
committed by Noisyfox
parent e2efccac09
commit 8bfe3a818c
3 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3168,6 +3168,7 @@ void ImGuiWrapper::filament_group(const std::string &filament_type, const char *
static ImTextureID transparent;
ImVec2 text_size = ImGui::CalcTextSize(filament_type.c_str());
// BBS image sizing based on text width (DPI scaling)
float four_word_width = ImGui::CalcTextSize("ABCD").x;
float img_width = ImGui::CalcTextSize("ABC").x;
ImVec2 img_size = {img_width, img_width * 1.5f};
ImVec2 id_text_size = this->calc_text_size(id);
@@ -3186,8 +3187,13 @@ void ImGuiWrapper::filament_group(const std::string &filament_type, const char *
float gray = 0.299 * rgb[0] + 0.587 * rgb[1] + 0.114 * rgb[2];
ImVec4 text_color = gray < 80 ? ImVec4(1.0f, 1.0f, 1.0f, 1.0f) : ImVec4(0, 0, 0, 1.0f);
this->text_colored(text_color, id.c_str());
ImGui::SetCursorPos({current_cursor.x + (img_size.x - text_size.x) * 0.5f, current_cursor.y + img_size.y});
float text_width_max = four_word_width;
if (filament_type.size() < 4) text_width_max = text_size.x;
current_cursor = ImGui::GetCursorPos();
ImGui::SetCursorPos({current_cursor.x + (img_size.x - text_width_max) * 0.5f + 2, current_cursor.y + 4});
ImGui::PushTextWrapPos(ImGui::GetCursorPosX() + four_word_width);
this->text(filament_type);
ImGui::PopTextWrapPos();
ImGui::EndGroup();
}
//ImGui::PopStyleVar(1);