From 0726819547e2e7801fa9ebb34a760c8d4a94eaf2 Mon Sep 17 00:00:00 2001 From: yw4z Date: Thu, 17 Jul 2025 10:26:55 +0300 Subject: [PATCH] Color & Icon fixes / improvements (#9773) * init * update * update * revert changes for stepmesh dialog * make highlight arrow more obvious * reset to zero icons * modernize return icon * better dark mode icon for project page * fix return arrow * revert changes for hyperlinks * update * Update SelectMachine.cpp * Update SendToPrinter.cpp * update * update plate icons * dragcanvas dark mode support * revert changes for calibration page * revert changes for bind dialog * Update BindDialog.cpp * fix green text on bbl calibration window * Update AmsMappingPopup.cpp * match measure axis color * fix * update * Update AmsMappingPopup.cpp * revert color change for hyperlink * Update NotificationManager.cpp * update * add icon for resonance avoidance * update * Fix wrong icon color after switching dark mode --------- Co-authored-by: Noisyfox --- resources/images/assemble_return.svg | 2 +- resources/images/backup_tips_img.svg | 4 ++-- .../images/param_resonance_avoidance.svg | 1 + resources/images/placeholder_excel.svg | 2 +- resources/images/placeholder_pdf.svg | 2 +- resources/images/placeholder_txt.svg | 2 +- resources/images/plate_close_hover.svg | 2 +- resources/images/plate_close_hover_dark.svg | 2 +- resources/images/plate_locked.svg | 2 +- resources/images/plate_locked_dark.svg | 2 +- resources/images/plate_locked_hover.svg | 2 +- resources/images/plate_locked_hover_dark.svg | 2 +- resources/images/plate_settings_changed.svg | 2 +- .../images/plate_settings_changed_dark.svg | 2 +- .../images/plate_settings_changed_hover.svg | 2 +- .../plate_settings_changed_hover_dark.svg | 2 +- resources/images/rename_edit.svg | 11 +-------- resources/images/tips_arrow.svg | 2 +- resources/images/toolbar_assembly.svg | 8 +------ resources/images/toolbar_assembly_dark.svg | 8 +------ resources/images/toolbar_brimears.svg | 20 +---------------- resources/images/toolbar_brimears_dark.svg | 20 +---------------- resources/images/toolbar_reset_zero.svg | 6 +---- resources/images/toolbar_reset_zero_hover.svg | 5 +---- resources/web/model/img/null2.png | Bin 4071 -> 4085 bytes src/slic3r/GUI/AmsMappingPopup.cpp | 4 ++-- src/slic3r/GUI/Auxiliary.cpp | 16 ++++++++----- src/slic3r/GUI/BedShapeDialog.cpp | 4 ++-- src/slic3r/GUI/Calibration.cpp | 4 ++-- src/slic3r/GUI/DragCanvas.cpp | 11 +++++---- src/slic3r/GUI/DragCanvas.hpp | 2 ++ src/slic3r/GUI/GLCanvas3D.cpp | 18 +++++++++------ src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp | 21 ++++++++++-------- src/slic3r/GUI/Gizmos/GLGizmosManager.cpp | 3 +++ src/slic3r/GUI/ImGuiWrapper.cpp | 2 ++ src/slic3r/GUI/ImGuiWrapper.hpp | 2 ++ src/slic3r/GUI/NotificationManager.cpp | 17 +++++++------- src/slic3r/GUI/SelectMachine.cpp | 16 ++++++------- src/slic3r/GUI/SendToPrinter.cpp | 6 ++--- src/slic3r/GUI/Tab.cpp | 2 +- 40 files changed, 102 insertions(+), 139 deletions(-) create mode 100644 resources/images/param_resonance_avoidance.svg diff --git a/resources/images/assemble_return.svg b/resources/images/assemble_return.svg index 314757070e..36c2b266c3 100644 --- a/resources/images/assemble_return.svg +++ b/resources/images/assemble_return.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/backup_tips_img.svg b/resources/images/backup_tips_img.svg index 0640f07390..63d6b5c11b 100644 --- a/resources/images/backup_tips_img.svg +++ b/resources/images/backup_tips_img.svg @@ -2,7 +2,7 @@ Layer 1 - - + + \ No newline at end of file diff --git a/resources/images/param_resonance_avoidance.svg b/resources/images/param_resonance_avoidance.svg new file mode 100644 index 0000000000..e576cf9b53 --- /dev/null +++ b/resources/images/param_resonance_avoidance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/placeholder_excel.svg b/resources/images/placeholder_excel.svg index 16eeb39650..69f457e7fd 100644 --- a/resources/images/placeholder_excel.svg +++ b/resources/images/placeholder_excel.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/placeholder_pdf.svg b/resources/images/placeholder_pdf.svg index a07e336d7e..6e7cb3adc0 100644 --- a/resources/images/placeholder_pdf.svg +++ b/resources/images/placeholder_pdf.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/placeholder_txt.svg b/resources/images/placeholder_txt.svg index 113a746d33..e4aa1882f6 100644 --- a/resources/images/placeholder_txt.svg +++ b/resources/images/placeholder_txt.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/plate_close_hover.svg b/resources/images/plate_close_hover.svg index 78154b649e..125142ed3a 100644 --- a/resources/images/plate_close_hover.svg +++ b/resources/images/plate_close_hover.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/plate_close_hover_dark.svg b/resources/images/plate_close_hover_dark.svg index 057950934e..c7546fdf59 100644 --- a/resources/images/plate_close_hover_dark.svg +++ b/resources/images/plate_close_hover_dark.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/plate_locked.svg b/resources/images/plate_locked.svg index ad62e0be45..292fd5d28a 100644 --- a/resources/images/plate_locked.svg +++ b/resources/images/plate_locked.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/plate_locked_dark.svg b/resources/images/plate_locked_dark.svg index 954e90a96e..a3c4f443db 100644 --- a/resources/images/plate_locked_dark.svg +++ b/resources/images/plate_locked_dark.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/plate_locked_hover.svg b/resources/images/plate_locked_hover.svg index 9898e71aa0..c93079b21f 100644 --- a/resources/images/plate_locked_hover.svg +++ b/resources/images/plate_locked_hover.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/plate_locked_hover_dark.svg b/resources/images/plate_locked_hover_dark.svg index f12e171e47..89de789327 100644 --- a/resources/images/plate_locked_hover_dark.svg +++ b/resources/images/plate_locked_hover_dark.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/plate_settings_changed.svg b/resources/images/plate_settings_changed.svg index 3c1cc319c0..f87ffbe062 100644 --- a/resources/images/plate_settings_changed.svg +++ b/resources/images/plate_settings_changed.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/plate_settings_changed_dark.svg b/resources/images/plate_settings_changed_dark.svg index 0858582095..c1d0a0e1bc 100644 --- a/resources/images/plate_settings_changed_dark.svg +++ b/resources/images/plate_settings_changed_dark.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/plate_settings_changed_hover.svg b/resources/images/plate_settings_changed_hover.svg index f2350ae353..a74227acd4 100644 --- a/resources/images/plate_settings_changed_hover.svg +++ b/resources/images/plate_settings_changed_hover.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/plate_settings_changed_hover_dark.svg b/resources/images/plate_settings_changed_hover_dark.svg index ee72de4a5e..a56f766e3b 100644 --- a/resources/images/plate_settings_changed_hover_dark.svg +++ b/resources/images/plate_settings_changed_hover_dark.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/rename_edit.svg b/resources/images/rename_edit.svg index 03e40f40c7..ef79670fd6 100644 --- a/resources/images/rename_edit.svg +++ b/resources/images/rename_edit.svg @@ -1,10 +1 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/resources/images/tips_arrow.svg b/resources/images/tips_arrow.svg index eb7da06766..a9798deafd 100644 --- a/resources/images/tips_arrow.svg +++ b/resources/images/tips_arrow.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/toolbar_assembly.svg b/resources/images/toolbar_assembly.svg index 1c2a025f5e..46eece92a4 100644 --- a/resources/images/toolbar_assembly.svg +++ b/resources/images/toolbar_assembly.svg @@ -1,7 +1 @@ - - - - - - - + \ No newline at end of file diff --git a/resources/images/toolbar_assembly_dark.svg b/resources/images/toolbar_assembly_dark.svg index f514dcb5cc..f33ae0c5a1 100644 --- a/resources/images/toolbar_assembly_dark.svg +++ b/resources/images/toolbar_assembly_dark.svg @@ -1,7 +1 @@ - - - - - - - + \ No newline at end of file diff --git a/resources/images/toolbar_brimears.svg b/resources/images/toolbar_brimears.svg index 1c5b42af41..eda999582f 100644 --- a/resources/images/toolbar_brimears.svg +++ b/resources/images/toolbar_brimears.svg @@ -1,19 +1 @@ - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/resources/images/toolbar_brimears_dark.svg b/resources/images/toolbar_brimears_dark.svg index fe016e3019..e4c625865b 100644 --- a/resources/images/toolbar_brimears_dark.svg +++ b/resources/images/toolbar_brimears_dark.svg @@ -1,19 +1 @@ - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/resources/images/toolbar_reset_zero.svg b/resources/images/toolbar_reset_zero.svg index 35c7469ab6..10be9c46fc 100644 --- a/resources/images/toolbar_reset_zero.svg +++ b/resources/images/toolbar_reset_zero.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/resources/images/toolbar_reset_zero_hover.svg b/resources/images/toolbar_reset_zero_hover.svg index b2b03a214f..10be9c46fc 100644 --- a/resources/images/toolbar_reset_zero_hover.svg +++ b/resources/images/toolbar_reset_zero_hover.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/resources/web/model/img/null2.png b/resources/web/model/img/null2.png index 9b932ab3e39cddbd19a2725515c0ceeee769811b..7c41cffc86b38deeb9508729e1989d9aa8a999b1 100644 GIT binary patch literal 4085 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 b>k+%!-*G7`wH2+vJsyP7H$j!_I^q8Xr?ARq literal 4071 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 diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index ff5fac1710..ca73bacd86 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -254,7 +254,7 @@ void MaterialItem::doRender(wxDC &dc) } if (m_selected) { - dc.SetPen(wxColour(0x00, 0xAE, 0x42)); + dc.SetPen(AMS_CONTROL_BRAND_COLOUR); // ORCA Highlight color for selected AMS in send job dialog dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.DrawRoundedRectangle(1, 1, MATERIAL_ITEM_SIZE.x - 1, MATERIAL_ITEM_SIZE.y - 1, 5); } @@ -266,7 +266,7 @@ void MaterialItem::doRender(wxDC &dc) } if (m_selected) { - dc.SetPen(wxColour(0x00, 0xAE, 0x42)); + dc.SetPen(AMS_CONTROL_BRAND_COLOUR); // ORCA Highlight color for selected AMS in send job dialog dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.DrawRoundedRectangle(0, 0, MATERIAL_ITEM_SIZE.x, MATERIAL_ITEM_SIZE.y, 5); } diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp index 5142701577..4deb621fd5 100644 --- a/src/slic3r/GUI/Auxiliary.cpp +++ b/src/slic3r/GUI/Auxiliary.cpp @@ -237,9 +237,11 @@ void AuFile::PaintBackground(wxDC &dc) dc.DrawText(m_add_file, pos); } else { - dc.SetPen(AUFILE_GREY200); - dc.SetBrush(AUFILE_GREY200); - dc.DrawRoundedRectangle(0, 0, size.x, size.y, AUFILE_ROUNDING); + // ORCA match look with add button + auto pen_width = FromDIP(2); + dc.SetPen(wxPen(AUFILE_GREY500, pen_width)); + dc.SetBrush(StateColor::darkModeColorFor(AUFILE_GREY200)); + dc.DrawRoundedRectangle(pen_width / 2, pen_width / 2, size.x - pen_width / 2, size.y - pen_width / 2, AUFILE_ROUNDING); dc.DrawBitmap(m_file_bitmap.bmp(), (size.x - m_file_bitmap.GetBmpWidth()) / 2, (size.y - m_file_bitmap.GetBmpHeight()) / 2); } } @@ -251,12 +253,16 @@ void AuFile::PaintForeground(wxDC &dc) wxSize size = m_type == MODEL_PICTURE ? AUFILE_PICTURES_SIZE : AUFILE_SIZE; if (m_hover) { - if (m_type == AddFileButton) { + + // ORCA add hover effect to borders + if (m_type == BILL_OF_MATERIALS || m_type == ASSEMBLY_GUIDE || m_type == OTHERS || m_type == MODEL_PICTURE || m_type == AddFileButton) { auto pen_width = FromDIP(2); dc.SetPen(wxPen(AUFILE_BRAND, pen_width)); - dc.SetBrush(StateColor::darkModeColorFor(AUFILE_BRAND_TRANSPARENT)); + dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.DrawRoundedRectangle(pen_width / 2, pen_width / 2, size.x - pen_width / 2, size.y - pen_width / 2, AUFILE_ROUNDING); + } + if (m_type == AddFileButton) { auto line_length = FromDIP(50); dc.DrawLine(wxPoint((size.x - line_length) / 2, size.y / 2), wxPoint((size.x + line_length) / 2, size.y / 2)); dc.DrawLine(wxPoint(size.x / 2, (size.y - line_length) / 2), wxPoint(size.x / 2, (size.y + line_length) / 2)); diff --git a/src/slic3r/GUI/BedShapeDialog.cpp b/src/slic3r/GUI/BedShapeDialog.cpp index 1aed26e661..9327dc920f 100644 --- a/src/slic3r/GUI/BedShapeDialog.cpp +++ b/src/slic3r/GUI/BedShapeDialog.cpp @@ -375,7 +375,7 @@ wxPanel* BedShapePanel::init_texture_panel() wxStaticText* lbl = dynamic_cast(e.GetEventObject()); if (lbl != nullptr) { bool exists = (m_custom_texture == NONE) || boost::filesystem::exists(m_custom_texture); - lbl->SetForegroundColour(exists ? /*wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)*/wxGetApp().get_label_clr_default() : wxColor(*wxRED)); + lbl->SetForegroundColour(exists ? wxGetApp().get_label_clr_default() : wxColour("#E14747")); // ORCA wxString tooltip_text = ""; if (m_custom_texture != NONE) { @@ -471,7 +471,7 @@ wxPanel* BedShapePanel::init_model_panel() wxStaticText* lbl = dynamic_cast(e.GetEventObject()); if (lbl != nullptr) { bool exists = (m_custom_model == NONE) || boost::filesystem::exists(m_custom_model); - lbl->SetForegroundColour(exists ? /*wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)*/wxGetApp().get_label_clr_default() : wxColor(*wxRED)); + lbl->SetForegroundColour(exists ? wxGetApp().get_label_clr_default() : wxColour("#E14747")); // ORCA wxString tooltip_text = ""; if (m_custom_model != NONE) { diff --git a/src/slic3r/GUI/Calibration.cpp b/src/slic3r/GUI/Calibration.cpp index eae3b2bfbd..d91b47140f 100644 --- a/src/slic3r/GUI/Calibration.cpp +++ b/src/slic3r/GUI/Calibration.cpp @@ -113,11 +113,11 @@ CalibrationDialog::CalibrationDialog(Plater *plater) auto cali_text_right_top = new wxStaticText(cali_right_panel, wxID_ANY, _L("Calibration Flow"), wxDefaultPosition, wxDefaultSize, 0); cali_text_right_top->Wrap(-1); cali_text_right_top->SetFont(::Label::Head_14); - cali_text_right_top->SetForegroundColour(wxColour(0x00, 0xAE, 0x42)); + cali_text_right_top->SetForegroundColour(AMS_CONTROL_BRAND_COLOUR); cali_text_right_top->SetBackgroundColour(BG_COLOR); auto staticline = new ::StaticLine(cali_right_panel); - staticline->SetLineColour(wxColour(0x00, 0xAE, 0x42)); + staticline->SetLineColour(AMS_CONTROL_BRAND_COLOUR); auto calibration_panel = new wxPanel(cali_right_panel); calibration_panel->SetBackgroundColour(BG_COLOR); auto calibration_sizer = new wxBoxSizer(wxVERTICAL); diff --git a/src/slic3r/GUI/DragCanvas.cpp b/src/slic3r/GUI/DragCanvas.cpp index 38a827dca8..04d51c0861 100644 --- a/src/slic3r/GUI/DragCanvas.cpp +++ b/src/slic3r/GUI/DragCanvas.cpp @@ -17,6 +17,9 @@ DragCanvas::DragCanvas(wxWindow* parent, const std::vector& colors, { SetBackgroundColour(*wxWHITE); + m_background_color = StateColor::darkModeColorFor("#FFFFFF"); // ORCA + m_border_color = StateColor::darkModeColorFor("#DBDBDB"); // ORCA + m_arrow_bmp = create_scaled_bitmap("plate_settings_arrow", this, 16); set_shape_list(colors, order); @@ -130,15 +133,15 @@ void DragCanvas::on_erase(wxEraseEvent& event) if (event.GetDC()) { auto& dc = *(event.GetDC()); - dc.SetPen(CANVAS_BORDER_COLOR); - dc.SetBrush(*wxWHITE_BRUSH); + dc.SetPen( m_border_color); // ORCA + dc.SetBrush(m_background_color); // ORCA dc.DrawRectangle({ 0,0 }, size); } else { wxClientDC dc(this); - dc.SetPen(CANVAS_BORDER_COLOR); - dc.SetBrush(*wxWHITE_BRUSH); + dc.SetPen( m_border_color); // ORCA + dc.SetBrush(m_background_color); // ORCA dc.DrawRectangle({ 0,0 }, size); } } diff --git a/src/slic3r/GUI/DragCanvas.hpp b/src/slic3r/GUI/DragCanvas.hpp index 7d4c72052e..aa8d8ddfa8 100644 --- a/src/slic3r/GUI/DragCanvas.hpp +++ b/src/slic3r/GUI/DragCanvas.hpp @@ -58,6 +58,8 @@ private: wxPoint m_drag_start_pos; wxBitmap m_arrow_bmp; wxPoint m_max_shape_pos; + wxColour m_background_color; // ORCA + wxColour m_border_color; // ORCA }; diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 1e400f6421..72ad8f59f5 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -8219,7 +8219,7 @@ void GLCanvas3D::_render_return_toolbar() const float font_size = ImGui::GetFontSize(); ImVec2 real_size = ImVec2(font_size * 4, font_size * 1.7); - ImVec2 button_icon_size = ImVec2(font_size * 1.3, font_size * 1.3); + ImVec2 button_icon_size = ImVec2(font_size * .55, font_size * 1.1); // ORCA ImGuiWrapper& imgui = *wxGetApp().imgui(); Size cnv_size = get_canvas_size(); @@ -8235,12 +8235,16 @@ void GLCanvas3D::_render_return_toolbar() const imgui.set_next_window_size(window_width, window_height, ImGuiCond_Always); #endif + ImVec4 fg_color = m_is_dark ? ImVec4(1.f, 1.f, 1.f, 0.88f) : ImVec4(50 / 255.f, 58 / 255.f, 61 / 255.f, 1.f); + ImVec4 bg_color = m_is_dark ? ImGuiWrapper::COL_TOOLBAR_BG_DARK : ImGuiWrapper::COL_TOOLBAR_BG; + ImVec4 bg_color_hover = bg_color + (m_is_dark ? ImVec4(.03f, .03f, .03f, 0) : ImVec4(-.02f, -.02f, -.02f, 0)); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 18.0f); - ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.149f, 0.180f, 0.188f, 0.3f)); - ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.149f, 0.180f, 0.188f, 0.15f)); - ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0.149f, 0.180f, 0.188f, 0.5f)); + ImGui::PushStyleColor(ImGuiCol_Button, bg_color); // ORCA Toolbar color + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, bg_color_hover); + ImGui::PushStyleColor(ImGuiCol_ButtonActive, bg_color); ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0.0f, 0.0f, 0.0f, 0.0f)); - ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); + ImGui::PushStyleColor(ImGuiCol_Text, fg_color); imgui.begin(_L("Assembly Return"), ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse); @@ -8252,7 +8256,7 @@ void GLCanvas3D::_render_return_toolbar() const ImVec2 uv1 = ImVec2(1.0f, 1.0f); ImVec4 bg_col = ImVec4(0.0f, 0.0f, 0.0f, 0.0f); - ImVec4 tint_col = ImVec4(1.0f, 1.0f, 1.0f, 1.0f); + ImVec4 tint_col = fg_color; // icon color ImVec2 margin = ImVec2(10.0f, 5.0f); if (ImGui::ImageTextButton(real_size,_utf8(L("Return")).c_str(), m_return_toolbar.get_return_texture_id(), button_icon_size, uv0, uv1, -1, bg_col, tint_col, margin)) { @@ -8363,7 +8367,7 @@ void GLCanvas3D::_render_paint_toolbar() const ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(spacing, spacing)); ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0); ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(spacing, 0)); - ImGui::PushStyleColor(ImGuiCol_WindowBg, { 0.f, 0.f, 0.f, 0.4f }); + ImGui::PushStyleColor(ImGuiCol_WindowBg, m_is_dark ? ImGuiWrapper::COL_TOOLBAR_BG_DARK : ImGuiWrapper::COL_TOOLBAR_BG); // ORCA Toolbar color imgui.set_next_window_pos(0.5f * canvas_w, 0, ImGuiCond_Always, 0.5f, 0.0f); float constraint_window_width = canvas_w - 2 * return_button_margin; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp index 139b21edcc..299e4da3d9 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp @@ -1932,35 +1932,38 @@ void GLGizmoMeasure::show_distance_xyz_ui() } }; auto add_edit_distance_xyz_box = [this](Vec3d &distance) { - m_imgui->disabled_begin(m_hit_different_volumes.size() == 1); - { + //m_imgui->disabled_begin(m_hit_different_volumes.size() == 1); + //{ if (m_measure_mode == EMeasureMode::ONLY_MEASURE) { m_can_set_xyz_distance = false; } - m_imgui->disabled_begin(!m_can_set_xyz_distance); + bool volume = m_hit_different_volumes.size() == 1; ImGui::TableNextRow(); ImGui::TableSetColumnIndex(0); - m_imgui->text_colored(ImGuiWrapper::COL_RED, "X:"); + m_imgui->text_colored(ImGuiWrapper::to_ImVec4(ColorRGBA::X()), "X:"); // ORCA match axis color ImGui::TableSetColumnIndex(1); ImGui::PushItemWidth(m_input_size_max); + m_imgui->disabled_begin(volume || !m_can_set_xyz_distance); // ORCA disable only input box othervise axis colors rendered dimmed ImGui::BBLInputDouble("##measure_distance_x", &m_buffered_distance[0], 0.0f, 0.0f, "%.2f"); + m_imgui->disabled_end(); ImGui::TableNextRow(); ImGui::TableSetColumnIndex(0); - m_imgui->text_colored(ImGuiWrapper::COL_GREEN, "Y:"); + m_imgui->text_colored(ImGuiWrapper::to_ImVec4(ColorRGBA::Y()), "Y:"); // ORCA match axis color ImGui::TableSetColumnIndex(1); + m_imgui->disabled_begin(volume || !m_can_set_xyz_distance); // ORCA disable only input box othervise axis colors rendered dimmed ImGui::BBLInputDouble("##measure_distance_y", &m_buffered_distance[1], 0.0f, 0.0f, "%.2f"); m_imgui->disabled_end(); - m_imgui->disabled_begin(!(m_same_model_object && m_can_set_xyz_distance)); ImGui::TableNextRow(); ImGui::TableSetColumnIndex(0); - m_imgui->text_colored(ImGuiWrapper::COL_BLUE, "Z:"); + m_imgui->text_colored(ImGuiWrapper::to_ImVec4(ColorRGBA::Z()), "Z:"); // ORCA match axis color ImGui::TableSetColumnIndex(1); + m_imgui->disabled_begin(volume || !(m_same_model_object && m_can_set_xyz_distance)); // ORCA disable only input box othervise axis colors rendered dimmed ImGui::BBLInputDouble("##measure_distance_z", &m_buffered_distance[2], 0.0f, 0.0f, "%.2f"); m_imgui->disabled_end(); - } - m_imgui->disabled_end(); + //} + //m_imgui->disabled_end(); if (m_last_active_item_imgui != m_current_active_imgui_id && m_hit_different_volumes.size() == 2) { Vec3d displacement = Vec3d::Zero(); if (std::abs(m_buffered_distance[0] - distance[0]) > EPSILON) { diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp index a1ee562ea2..b6f8d6e5d5 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp @@ -169,6 +169,9 @@ void GLGizmosManager::switch_gizmos_icon_filename() case (EType::Assembly): gizmo->set_icon_filename(m_is_dark ? "toolbar_assembly_dark.svg" : "toolbar_assembly.svg"); break; + case (EType::BrimEars): + gizmo->set_icon_filename(m_is_dark ? "toolbar_brimears_dark.svg" : "toolbar_brimears.svg"); + break; } } diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp index 8b3cbbeaeb..6b93098aa2 100644 --- a/src/slic3r/GUI/ImGuiWrapper.cpp +++ b/src/slic3r/GUI/ImGuiWrapper.cpp @@ -176,6 +176,8 @@ const ImVec4 ImGuiWrapper::COL_SEPARATOR_DARK = { 0.24f, 0.24f, 0.27f, 1.0f } const ImVec4 ImGuiWrapper::COL_TITLE_BG = { 0.745f, 0.745f, 0.745f, 1.0f }; const ImVec4 ImGuiWrapper::COL_WINDOW_BG = { 1.000f, 1.000f, 1.000f, 1.0f }; const ImVec4 ImGuiWrapper::COL_WINDOW_BG_DARK = { 45 / 255.f, 45 / 255.f, 49 / 255.f, 1.f }; +const ImVec4 ImGuiWrapper::COL_TOOLBAR_BG = { 250 / 255.f, 250 / 255.f, 250 / 255.f, 1.f }; // ORCA color matches with toolbar_background.png +const ImVec4 ImGuiWrapper::COL_TOOLBAR_BG_DARK = { 57 / 255.f, 60 / 255.f, 66 / 255.f, 1.f }; // ORCA color matches with toolbar_background_dark.png const ImVec4 ImGuiWrapper::COL_ORCA = to_ImVec4(ColorRGBA::ORCA()); int ImGuiWrapper::TOOLBAR_WINDOW_FLAGS = ImGuiWindowFlags_AlwaysAutoResize diff --git a/src/slic3r/GUI/ImGuiWrapper.hpp b/src/slic3r/GUI/ImGuiWrapper.hpp index cd1b3d98e4..65c8225120 100644 --- a/src/slic3r/GUI/ImGuiWrapper.hpp +++ b/src/slic3r/GUI/ImGuiWrapper.hpp @@ -336,6 +336,8 @@ public: static const ImVec4 COL_TITLE_BG; static const ImVec4 COL_WINDOW_BG; static const ImVec4 COL_WINDOW_BG_DARK; + static const ImVec4 COL_TOOLBAR_BG; + static const ImVec4 COL_TOOLBAR_BG_DARK; static const ImVec4 COL_SEPARATOR; static const ImVec4 COL_SEPARATOR_DARK; static const ImVec4 COL_ORCA; diff --git a/src/slic3r/GUI/NotificationManager.cpp b/src/slic3r/GUI/NotificationManager.cpp index b66777acb3..09de590c8b 100644 --- a/src/slic3r/GUI/NotificationManager.cpp +++ b/src/slic3r/GUI/NotificationManager.cpp @@ -147,8 +147,8 @@ NotificationManager::PopNotification::PopNotification(const NotificationData &n, , m_evt_handler (evt_handler) , m_notification_start (GLCanvas3D::timestamp_now()) { - m_ErrorColor = ImVec4(0.9, 0.36, 0.36, 1); - m_WarnColor = ImVec4(0.99, 0.69, 0.455, 1); + m_ErrorColor = ImGuiWrapper::to_ImVec4(decode_color_to_float_array("#E14747")); // ORCA + m_WarnColor = ImGuiWrapper::to_ImVec4(decode_color_to_float_array("#F59B16")); // ORCA m_NormalColor = ImVec4(0, 0.588, 0.533, 1); m_CurrentColor = m_NormalColor; //Default @@ -370,13 +370,14 @@ void NotificationManager::PopNotification::bbl_render_block_notification(GLCanva use_bbl_theme(); if (m_data.level == NotificationLevel::SeriousWarningNotificationLevel) - { - push_style_color(ImGuiCol_Border, {245.f / 255.f, 155 / 255.f, 22 / 255.f, 1}, true, m_current_fade_opacity); - push_style_color(ImGuiCol_WindowBg, {245.f / 255.f, 155 / 255.f, 22 / 255.f, 1}, true, m_current_fade_opacity); + { // ORCA match and ensure color usage + push_style_color(ImGuiCol_Border, m_WarnColor, true, m_current_fade_opacity); + push_style_color(ImGuiCol_WindowBg, m_WarnColor, true, m_current_fade_opacity); } - if (m_data.level == NotificationLevel::ErrorNotificationLevel) { - push_style_color(ImGuiCol_Border, {225.f / 255.f, 71 / 255.f, 71 / 255.f, 1}, true, m_current_fade_opacity); - push_style_color(ImGuiCol_WindowBg, {225.f / 255.f, 71 / 255.f, 71 / 255.f, 1}, true, m_current_fade_opacity); + if (m_data.level == NotificationLevel::ErrorNotificationLevel) + { // ORCA match and ensure color usage + push_style_color(ImGuiCol_Border, m_ErrorColor, true, m_current_fade_opacity); + push_style_color(ImGuiCol_WindowBg, m_ErrorColor, true, m_current_fade_opacity); } push_style_color(ImGuiCol_Text, { 1,1,1,1 }, true, m_current_fade_opacity); diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 5a1540280f..a164a6fb60 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -162,20 +162,20 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_rename_normal_panel->SetBackgroundColour(*wxWHITE); rename_sizer_v = new wxBoxSizer(wxVERTICAL); rename_sizer_h = new wxBoxSizer(wxHORIZONTAL); - m_rename_text = new wxStaticText(m_rename_normal_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END); m_rename_text->SetFont(::Label::Body_13); m_rename_text->SetBackgroundColour(*wxWHITE); m_rename_text->SetMaxSize(wxSize(FromDIP(340), -1)); - rename_editable = new ScalableBitmap(this, "rename_edit", 20); - rename_editable_light = new ScalableBitmap(this, "rename_edit", 20); + rename_editable = new ScalableBitmap(this, "rename_edit", FromDIP(13)); // ORCA Match edit icon and its size + rename_editable_light = new ScalableBitmap(this, "rename_edit", FromDIP(13)); // ORCA Match edit icon and its size m_rename_button = new wxStaticBitmap(m_rename_normal_panel, wxID_ANY, rename_editable->bmp(), wxDefaultPosition, wxSize(FromDIP(20), FromDIP(20)), 0); m_rename_button->Bind(wxEVT_ENTER_WINDOW, [this](auto& e) {SetCursor(wxCURSOR_HAND); }); m_rename_button->Bind(wxEVT_LEAVE_WINDOW, [this](auto& e) {SetCursor(wxCURSOR_ARROW); }); - rename_sizer_h->Add(m_rename_text, 0, wxALIGN_CENTER|wxTOP, FromDIP(2)); - rename_sizer_h->Add(m_rename_button, 0, wxALIGN_CENTER, 0); + rename_sizer_h->Add(m_rename_text, 0, wxALIGN_CENTER, 0); // ORCA align text with icon + rename_sizer_h->Add(m_rename_button, 0, wxALIGN_CENTER| wxLEFT, FromDIP(3)); // ORCA add gap between text and icon rename_sizer_v->Add(rename_sizer_h, 1, wxTOP, 0); + m_rename_normal_panel->SetSizer(rename_sizer_v); m_rename_normal_panel->Layout(); rename_sizer_v->Fit(m_rename_normal_panel); @@ -3626,9 +3626,9 @@ void SelectMachineDialog::set_default_normal(const ThumbnailData &data) char weight[64]; if (wxGetApp().app_config->get("use_inches") == "1") { - ::sprintf(weight, " %.2f oz", aprint_stats.total_weight * 0.035274); + ::sprintf(weight, "%.2f oz", aprint_stats.total_weight * 0.035274); // ORCA remove spacing before text } else { - ::sprintf(weight, " %.2f g", aprint_stats.total_weight); + ::sprintf(weight, "%.2f g", aprint_stats.total_weight); // ORCA remove spacing before text } m_stext_time->SetLabel(time); @@ -3761,7 +3761,7 @@ void SelectMachineDialog::set_default_from_sdcard() wxString time; time = wxString::Format("%s", short_time(get_time_dhms(float_time))); char weight[64]; - ::sprintf(weight, " %.2f g", float_weight); + ::sprintf(weight, "%.2f g", float_weight); // ORCA remove spacing before text m_stext_time->SetLabel(time); m_stext_weight->SetLabel(weight); } diff --git a/src/slic3r/GUI/SendToPrinter.cpp b/src/slic3r/GUI/SendToPrinter.cpp index 4f290683ef..dd435d2474 100644 --- a/src/slic3r/GUI/SendToPrinter.cpp +++ b/src/slic3r/GUI/SendToPrinter.cpp @@ -439,7 +439,7 @@ SendToPrinterDialog::SendToPrinterDialog(Plater *plater) m_rename_text->SetForegroundColour(*wxBLACK); m_rename_text->SetFont(::Label::Body_13); m_rename_text->SetMaxSize(wxSize(FromDIP(390), -1)); - m_rename_button = new Button(m_rename_normal_panel, "", "ams_editable", wxBORDER_NONE, FromDIP(10)); + m_rename_button = new Button(m_rename_normal_panel, "", "rename_edit", wxBORDER_NONE, FromDIP(13)); // ORCA Match edit icon and its size m_rename_button->SetBackgroundColor(*wxWHITE); m_rename_button->SetBackgroundColour(*wxWHITE); @@ -1349,9 +1349,9 @@ void SendToPrinterDialog::set_default() char weight[64]; if (wxGetApp().app_config->get("use_inches") == "1") { - ::sprintf(weight, " %.2f oz", aprint_stats.total_weight*0.035274); + ::sprintf(weight, "%.2f oz", aprint_stats.total_weight*0.035274); // ORCA remove spacing before text }else{ - ::sprintf(weight, " %.2f g", aprint_stats.total_weight); + ::sprintf(weight, "%.2f g", aprint_stats.total_weight); // ORCA remove spacing before text } m_stext_time->SetLabel(time); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 9163298faf..c1b4e0ee88 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -4228,7 +4228,7 @@ PageShp TabPrinter::build_kinematics_page() optgroup->append_single_option_line("emit_machine_limits_to_gcode"); // resonance avoidance ported over from qidi slicer - optgroup = page->new_optgroup(L("Resonance Avoidance")); + optgroup = page->new_optgroup(L("Resonance Avoidance"), "param_resonance_avoidance"); optgroup->append_single_option_line("resonance_avoidance"); // Resonance‑avoidance speed inputs {