From 43af6d221bf4c8fd5c8c568cff1e7bb1a8d4fab4 Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Mon, 17 Feb 2025 16:51:56 +0800 Subject: [PATCH] Update to Orca style --- resources/images/toolbar_brimears.svg | 32 +++++++++++----------- resources/images/toolbar_brimears_dark.svg | 32 +++++++++++----------- src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp | 8 +++--- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/resources/images/toolbar_brimears.svg b/resources/images/toolbar_brimears.svg index e512da071..1c5b42af4 100644 --- a/resources/images/toolbar_brimears.svg +++ b/resources/images/toolbar_brimears.svg @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar_brimears_dark.svg b/resources/images/toolbar_brimears_dark.svg index 3c33d8dd6..fe016e301 100644 --- a/resources/images/toolbar_brimears_dark.svg +++ b/resources/images/toolbar_brimears_dark.svg @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp index d25b568b7..5ee7bab7c 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp @@ -687,7 +687,7 @@ void GLGizmoBrimEars::on_render_input_window(float x, float y, float bottom_limi if (glb_cfg.opt_enum("brim_type") != btPainted) { ImGui::SameLine(); auto link_text = [&]() { - ImColor HyperColor = m_link_text_hover ? ImColor(0, 240, 91).Value : ImColor(0, 174, 66).Value; + ImColor HyperColor = ImGuiWrapper::COL_ORCA; ImGui::PushStyleColor(ImGuiCol_Text, ImGuiWrapper::to_ImVec4(ColorRGB::WARNING())); float parent_width = ImGui::GetContentRegionAvail().x; m_imgui->text_wrapped(_L("Warning: The brim type is not set to \"painted\",the brim ears will not take effect !"), parent_width); @@ -746,10 +746,10 @@ void GLGizmoBrimEars::show_tooltip_information(float x, float y) caption_max += m_imgui->calc_text_size(": "sv).x + 35.f; - float font_size = ImGui::GetFontSize(); - ImVec2 button_size = ImVec2(font_size * 1.8, font_size * 1.3); + float scale = m_parent.get_scale(); + ImVec2 button_size = ImVec2(25 * scale, 25 * scale); // ORCA: Use exact resolution will prevent blur on icon ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f); - ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {0, ImGui::GetStyle().FramePadding.y}); + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, {0, 0}); // ORCA: Dont add padding ImGui::ImageButton3(normal_id, hover_id, button_size); if (ImGui::IsItemHovered()) {