diff --git a/resources/images/assemble_return.svg b/resources/images/assemble_return.svg index 314757070e9..36c2b266c35 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 0640f07390a..63d6b5c11b4 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/placeholder_excel.svg b/resources/images/placeholder_excel.svg index 16eeb396502..69f457e7fd3 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 a07e336d7e7..6e7cb3adc0a 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 113a746d33f..e4aa1882f6c 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 78154b649e8..125142ed3a7 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 057950934e7..c7546fdf593 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 ad62e0be45b..292fd5d28a6 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 954e90a96e9..a3c4f443db3 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 9898e71aa05..c93079b21f1 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 f12e171e474..89de7893272 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 3c1cc319c01..f87ffbe062d 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 0858582095c..c1d0a0e1bcc 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 f2350ae3531..a74227acd49 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 ee72de4a5e1..a56f766e3bf 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/tips_arrow.svg b/resources/images/tips_arrow.svg index eb7da067664..a9798deafd9 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 1c2a025f5e3..46eece92a4d 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 f514dcb5cc2..f33ae0c5a19 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 1c5b42af41d..eda999582ff 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 fe016e30193..e4c625865ba 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 35c7469ab67..10be9c46fc0 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 b2b03a214f0..10be9c46fc0 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 9b932ab3e39..7c41cffc86b 100644 Binary files a/resources/web/model/img/null2.png and b/resources/web/model/img/null2.png differ diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index 86610594524..4d7a643bd92 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(wxColour("#009688")); // 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(wxColour("#009688")); // 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 51427015773..4deb621fd5d 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 893455914a3..5a2ec2347a1 100644 --- a/src/slic3r/GUI/BedShapeDialog.cpp +++ b/src/slic3r/GUI/BedShapeDialog.cpp @@ -374,7 +374,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() : wxGetApp().get_label_clr_error()); // ORCA wxString tooltip_text = ""; if (m_custom_texture != NONE) { @@ -470,7 +470,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() : wxGetApp().get_label_clr_error()); // ORCA wxString tooltip_text = ""; if (m_custom_model != NONE) { diff --git a/src/slic3r/GUI/Calibration.cpp b/src/slic3r/GUI/Calibration.cpp index 34ffd6f15b9..b4a807f762e 100644 --- a/src/slic3r/GUI/Calibration.cpp +++ b/src/slic3r/GUI/Calibration.cpp @@ -115,11 +115,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 38a827dca8b..04d51c08618 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 7d4c72052ec..aa8d8ddfa8b 100644 --- a/src/slic3r/GUI/DragCanvas.hpp +++ b/src/slic3r/GUI/DragCanvas.hpp @@ -58,6 +58,8 @@ class DragCanvas : public wxPanel 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 a1e7f55b9cf..03f39841ab6 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -8216,7 +8216,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(); @@ -8232,12 +8232,13 @@ 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); 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, ImGuiWrapper::to_ImVec4(decode_color_to_float_array(m_is_dark ? "#393C42" : "#FAFAFA" )));// ORCA Toolbar color + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGuiWrapper::to_ImVec4(decode_color_to_float_array(m_is_dark ? "#46484D" : "#F4F6F6" ))); + ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImGuiWrapper::to_ImVec4(decode_color_to_float_array(m_is_dark ? "#55555A" : "#EFF1F2" ))); 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); @@ -8249,7 +8250,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; 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)) { @@ -8360,7 +8361,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, ImGuiWrapper::to_ImVec4(decode_color_to_float_array(m_is_dark ? "#393C42" : "#FAFAFA" ))); // 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/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index da946343186..14c1dce8f63 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -2924,6 +2924,7 @@ void GUI_App::init_label_colours() bool is_dark_mode = dark_mode(); m_color_label_modified = is_dark_mode ? wxColour("#F1754E") : wxColour("#F1754E"); m_color_label_sys = is_dark_mode ? wxColour("#B2B3B5") : wxColour("#363636"); + m_color_label_error = wxColour("#E14747"); // same color used on block notification #if defined(_WIN32) || defined(__linux__) || defined(__APPLE__) m_color_label_default = is_dark_mode ? wxColour(250, 250, 250) : m_color_label_sys; // wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index fb334568efe..137d6bf62f1 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -244,6 +244,7 @@ class GUI_App : public wxApp wxColour m_color_label_modified; wxColour m_color_label_sys; wxColour m_color_label_default; + wxColour m_color_label_error; wxColour m_color_window_default; wxColour m_color_highlight_label_default; wxColour m_color_hovered_btn_label; @@ -400,6 +401,7 @@ class GUI_App : public wxApp const wxColour& get_label_clr_modified() { return m_color_label_modified; } const wxColour& get_label_clr_sys() { return m_color_label_sys; } const wxColour& get_label_clr_default() { return m_color_label_default; } + const wxColour& get_label_clr_error() { return m_color_label_error; } const wxColour& get_window_default_clr(){ return m_color_window_default; } // BBS diff --git a/src/slic3r/GUI/NotificationManager.cpp b/src/slic3r/GUI/NotificationManager.cpp index c4b867c0763..3cb287ccaa1 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 = ImVec4(225 / 255.f, 71 / 255.f, 71 / 255.f, 1); // ORCA + m_WarnColor = ImVec4(245 / 255.f, 155 / 255.f, 22 / 255.f, 1); // 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); - } - 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); + { // 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) + { // 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); @@ -712,10 +713,11 @@ void NotificationManager::PopNotification::render_hypertext(ImGuiWrapper& imgui, //hover color ImVec4 HyperColor = m_HyperTextColor;//ImVec4(150.f / 255.f, 100.f / 255.f, 0.f / 255.f, 1) - if (m_data.level == NotificationLevel::SeriousWarningNotificationLevel) - HyperColor = ImVec4(0.f, 0.f, 0.f, 0.4f); - if (m_data.level == NotificationLevel::ErrorNotificationLevel) - HyperColor = ImVec4(135.f / 255.f, 43 / 255.f, 43 / 255.f, 1); + // ORCA dont change hypertext/link color to keep them consistent + //if (m_data.level == NotificationLevel::SeriousWarningNotificationLevel) + // HyperColor = ImVec4(0.f, 0.f, 0.f, 0.4f); + //if (m_data.level == NotificationLevel::ErrorNotificationLevel) + // HyperColor = ImVec4(135.f / 255.f, 43 / 255.f, 43 / 255.f, 1); if (ImGui::IsItemHovered(ImGuiHoveredFlags_RectOnly)) { HyperColor.y += 0.1f; diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index fd93b42e907..0a4655a1b60 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -1016,7 +1016,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_rename_button->SetBackgroundColour(*wxWHITE); rename_sizer_h->Add(m_rename_text, 0, wxALIGN_CENTER, 0); - rename_sizer_h->Add(m_rename_button, 0, wxALIGN_CENTER, 0); + rename_sizer_h->Add(m_rename_button, 0, wxALIGN_CENTER | wxLEFT, FromDIP(5)); // ORCA add gap between text and icon rename_sizer_v->Add(rename_sizer_h, 1, wxALIGN_CENTER, 0); m_rename_normal_panel->SetSizer(rename_sizer_v); m_rename_normal_panel->Layout(); @@ -1121,9 +1121,9 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) wxBoxSizer* m_sizer_material_area = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* m_sizer_material_tips = new wxBoxSizer(wxHORIZONTAL); - enable_ams_mapping = new ScalableBitmap(this, "enable_ams", 16); - img_amsmapping_tip = new wxStaticBitmap(m_scrollable_region, wxID_ANY, enable_ams_mapping->bmp(), wxDefaultPosition, wxSize(FromDIP(16), FromDIP(16)), 0); - m_sizer_material_tips->Add(img_amsmapping_tip, 0, wxALIGN_CENTER | wxLEFT, FromDIP(5)); + enable_ams_mapping = new ScalableBitmap(this, "enable_ams", 25); // ORCA match icon size + img_amsmapping_tip = new wxStaticBitmap(m_scrollable_region, wxID_ANY, enable_ams_mapping->bmp(), wxDefaultPosition, wxSize(FromDIP(25), FromDIP(25)), 0); + m_sizer_material_tips->Add(img_amsmapping_tip, 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL); img_amsmapping_tip->Bind(wxEVT_ENTER_WINDOW, [this](auto& e) { wxPoint img_pos = img_amsmapping_tip->ClientToScreen(wxPoint(0, 0)); @@ -1146,8 +1146,8 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_sizer_material = new wxGridSizer(0, 4, 0, FromDIP(5)); - m_sizer_material_area->Add(m_sizer_material_tips, 0, wxALIGN_CENTER|wxLEFT, FromDIP(8)); - m_sizer_material_area->Add(m_sizer_material, 0, wxLEFT, FromDIP(15)); + m_sizer_material_area->Add(m_sizer_material_tips, 0, wxALIGN_CENTER | wxEXPAND); // ORCA align button to left and allow big icon + m_sizer_material_area->Add(m_sizer_material, 0, wxLEFT, FromDIP(5)); m_sizer_backup = new wxBoxSizer(wxHORIZONTAL); m_ams_backup_tip = new Label(this, _L("Auto Refill")); @@ -4370,10 +4370,10 @@ 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 begore text } else { - ::sprintf(weight, " %.2f g", aprint_stats.total_weight); + ::sprintf(weight, "%.2f g", aprint_stats.total_weight); // ORCA remove spacing begore text } m_stext_time->SetLabel(time); @@ -4524,7 +4524,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 begore 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 7d0fb5663cd..4a0fb3c6a6e 100644 --- a/src/slic3r/GUI/SendToPrinter.cpp +++ b/src/slic3r/GUI/SendToPrinter.cpp @@ -443,12 +443,12 @@ 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, "", "ams_editable", wxBORDER_NONE, FromDIP(13)); // ORCA fix edit icon size m_rename_button->SetBackgroundColor(*wxWHITE); m_rename_button->SetBackgroundColour(*wxWHITE); rename_sizer_h->Add(m_rename_text, 0, wxALIGN_CENTER, 0); - rename_sizer_h->Add(m_rename_button, 0, wxALIGN_CENTER, 0); + rename_sizer_h->Add(m_rename_button, 0, wxALIGN_CENTER | wxLEFT, FromDIP(1)); // ORCA add gap between text and icon rename_sizer_v->Add(rename_sizer_h, 1, wxALIGN_CENTER, 0); m_rename_normal_panel->SetSizer(rename_sizer_v); m_rename_normal_panel->Layout(); @@ -1353,9 +1353,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 begore text }else{ - ::sprintf(weight, " %.2f g", aprint_stats.total_weight); + ::sprintf(weight, "%.2f g", aprint_stats.total_weight); // ORCA remove spacing begore text } m_stext_time->SetLabel(time);