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

FIX: inconsistent colour arrange display at different resolutions

Browse Source 
JIRA: no
Change-Id: Id838bf68c8a58d9075994052af10fa31bacc2ed3
(cherry picked from commit 91ea29eb56a148606cc645dfbca17fe470cb6131)
This commit is contained in:
Mack
2024-07-16 10:01:59 +08:00
committed by Noisyfox
parent 5a6b215ef0
commit 5e64197e08
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3166,9 +3166,11 @@ void ImGuiWrapper::filament_group(const std::string &filament_type, const char *
std::string id = std::to_string(static_cast<unsigned int> (filament_id + 1));
ImDrawList *draw_list = ImGui::GetWindowDrawList();
static ImTextureID transparent;
ImVec2 img_size = {30.0f, 45.0f};
ImVec2 text_size = ImGui::CalcTextSize(filament_type.c_str());
ImVec2 id_text_size = this->calc_text_size(id);
ImVec2 text_size = ImGui::CalcTextSize(filament_type.c_str());
// BBS image sizing based on text width (DPI scaling)
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);
unsigned char rgb[3];
BitmapCache::load_from_svg_file_change_color(Slic3r::resources_dir() + "/images/filament_green.svg", img_size.x, img_size.y, transparent, hex_color);
@@ -3184,7 +3186,7 @@ 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 + 40});
ImGui::SetCursorPos({current_cursor.x + (img_size.x - text_size.x) * 0.5f, current_cursor.y + img_size.y});
this->text(filament_type);
ImGui::EndGroup();
}