diff --git a/resources/images/bind_device_ping_code.svg b/resources/images/bind_device_ping_code.svg index 5c1ff4742..2d83240ad 100644 --- a/resources/images/bind_device_ping_code.svg +++ b/resources/images/bind_device_ping_code.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/images/hms_arrow.svg b/resources/images/hms_arrow.svg index 5cebec400..c48bfd9a3 100644 --- a/resources/images/hms_arrow.svg +++ b/resources/images/hms_arrow.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/web/homepage/css/dark.css b/resources/web/homepage/css/dark.css index 8f585744d..69df4c34a 100644 --- a/resources/web/homepage/css/dark.css +++ b/resources/web/homepage/css/dark.css @@ -33,7 +33,7 @@ body /*----Left Menu Button----*/ #LogoutBtn:hover { - background: #004942; + background: #223C3C; color: #efeff0; } @@ -45,7 +45,7 @@ body .BtnItem:hover { color: #efeff0; - background-color: #004942; + background-color: #223C3C; } .BtnItem:hover .LeftIcon @@ -56,7 +56,7 @@ body .BtnItemSelected { color: #efeff0; - background-color: #004942; + background-color: #223C3C; } .BtnItemSelected .LeftIcon @@ -67,8 +67,8 @@ body /*-----Right Top MenuBtn-----*/ .MenuItem:hover { - border-color: #4db6ac; - background-color: #004942; + border-color: #00675b; + background-color: #223C3C; } #RecentClearAllBtn:hover @@ -76,6 +76,11 @@ body color: #000; } +.FileImg +{ + background-color: #36363C; /*ORCA use darker color for dark theme for thumbnails*/ +} + #recnet_context_menu { color: #efeff0; @@ -84,6 +89,11 @@ body box-shadow: 0px 0px 3px #DCDCDC; } +.CT_Item:hover +{ + background-color:#00675b; /*ORCA color*/ +} + /*----User Manual------*/ .UG_DESC { diff --git a/resources/web/homepage/css/home.css b/resources/web/homepage/css/home.css index eb4d59553..ce70b2869 100644 --- a/resources/web/homepage/css/home.css +++ b/resources/web/homepage/css/home.css @@ -203,12 +203,12 @@ body .BtnItem:hover { - background-color: #E0FCEB; + background-color: #BFE1DE; /*ORCA color with %25 opacity*/ } .BtnItemSelected { - background-color: #e0fcf3; + background-color: #BFE1DE; /*ORCA color with %25 opacity*/ } .BtnIcon @@ -277,8 +277,8 @@ body .MenuItem:hover { - border-color: #4db6ac; - background-color: #E0FCEB; + border-color: #009688; /*ORCA color*/ + background-color: #E5F0EE; /*ORCA color with %25 opacity*/ } .MenuIcon @@ -465,7 +465,7 @@ body .CT_Item:hover { cursor: pointer; - background-color: #0078D4; + background-color:#009688; /*ORCA color*/ border-radius: 4px; color: #fff; } diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index f4e69dd58..52d04bed5 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -339,7 +339,7 @@ AboutDialog::AboutDialog() (boost::format( "" "" - "

https://github.com/SoftFever/Orcaslicer

" + "

https://github.com/SoftFever/Orcaslicer

" "" "") ).str()); diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp index c28457ea0..8d338edc2 100644 --- a/src/slic3r/GUI/Auxiliary.cpp +++ b/src/slic3r/GUI/Auxiliary.cpp @@ -843,6 +843,7 @@ void AuxiliaryPanel::init_tabpanel() auto back_btn = new Button(this, _L("return"), "assemble_return", wxBORDER_NONE | wxBU_LEFT | wxBU_EXACTFIT); back_btn->SetSize(wxSize(FromDIP(220), FromDIP(18))); back_btn->SetBackgroundColor(btn_bg_green); + back_btn->SetTextColor(StateColor (std::pair(wxColour("#FDFFFD"), StateColor::Normal))); // ORCA fixes color change on text. icon stays white color but text changes to black without this back_btn->SetCornerRadius(0); back_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](wxEvent& e) { auto event = wxCommandEvent(EVT_AUXILIARY_DONE); diff --git a/src/slic3r/GUI/Auxiliary.hpp b/src/slic3r/GUI/Auxiliary.hpp index b1378d087..878f032b9 100644 --- a/src/slic3r/GUI/Auxiliary.hpp +++ b/src/slic3r/GUI/Auxiliary.hpp @@ -52,7 +52,7 @@ #define AUFILE_GREY300 wxColour(238, 238, 238) #define AUFILE_GREY200 wxColour(248, 248, 248) #define AUFILE_BRAND wxColour(0, 150, 136) -#define AUFILE_BRAND_TRANSPARENT wxColour(215, 232, 222) +#define AUFILE_BRAND_TRANSPARENT wxColour("#E5F0EE") // ORCA color with %10 opacity //#define AUFILE_PICTURES_SIZE wxSize(FromDIP(300), FromDIP(300)) //#define AUFILE_PICTURES_PANEL_SIZE wxSize(FromDIP(300), FromDIP(340)) #define AUFILE_PICTURES_SIZE wxSize(FromDIP(168), FromDIP(168)) diff --git a/src/slic3r/GUI/BitmapCache.cpp b/src/slic3r/GUI/BitmapCache.cpp index ae0678f6b..db334cd99 100644 --- a/src/slic3r/GUI/BitmapCache.cpp +++ b/src/slic3r/GUI/BitmapCache.cpp @@ -336,7 +336,7 @@ wxBitmap* BitmapCache::load_svg(const std::string &bitmap_name, unsigned target_ replaces["\"#00FF00\""] = "\"#FF0000\""; replaces["\"#009688\""] = "\"#00675b\""; replaces["#DBDBDB"] = "#4A4A51"; // ORCA border color - replaces["#F0F0F1"] = "#404040"; // ORCA disabled background color + replaces["#F0F0F1"] = "#333337"; // ORCA disabled background color replaces["#262E30"] = "#EFEFF0"; // ORCA } else { replaces["#949494"] = "#7C8282"; // ORCA replace icon line color for light theme diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index a378f6397..511bbfa6f 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -7852,7 +7852,7 @@ void GLCanvas3D::_render_imgui_select_plate_toolbar() ImVec4 scroll_col = ImVec4(0.77f, 0.77f, 0.77f, 1.0f); //ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.f, 0.f, 0.f, 1.0f)); //use white text as the background switch to black - ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); + ImGui::PushStyleColor(ImGuiCol_Text, m_is_dark ? ImVec4(.9f, .9f, .9f, 1) : ImVec4(.3f, .3f, .3f, 1)); // ORCA Plate number text > Add support for dark mode ImGui::PushStyleColor(ImGuiCol_WindowBg, window_bg); ImGui::PushStyleColor(ImGuiCol_ScrollbarBg, ImVec4(0.f, 0.f, 0.f, 0.f)); // ORCA using background color with opacity creates a second color. This prevents secondary color ImGui::PushStyleColor(ImGuiCol_ScrollbarGrabActive, scroll_col); diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 842909985..eedf223ae 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -2876,7 +2876,7 @@ void GUI_App::init_label_colours() #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); m_color_highlight_label_default = is_dark_mode ? wxColour(230, 230, 230): wxSystemSettings::GetColour(/*wxSYS_COLOUR_HIGHLIGHTTEXT*/wxSYS_COLOUR_WINDOWTEXT); - m_color_highlight_default = is_dark_mode ? wxColour(78, 78, 78) : wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); + m_color_highlight_default = is_dark_mode ? wxColour("#36363B") : wxColour("#F1F1F1"); // ORCA row highlighting m_color_hovered_btn_label = is_dark_mode ? wxColour(255, 255, 254) : wxColour(0,0,0); m_color_default_btn_label = is_dark_mode ? wxColour(255, 255, 254): wxColour(0,0,0); m_color_selected_btn_bg = is_dark_mode ? wxColour(84, 84, 91) : wxColour(206, 206, 206); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp index 0329d7c50..6ad62f1a8 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp @@ -291,12 +291,13 @@ void GLGizmoFdmSupports::on_render_input_window(float x, float y, float bottom_l if (i != 0) ImGui::SameLine((empty_button_width + m_imgui->scaled(1.75f)) * i + m_imgui->scaled(1.3f)); ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0); - ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.f)); // ORCA: Fixes icon rendered without colors while using Light theme + ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.f, 0.f, 0.f, 0.f)); // ORCA Removes button background on dark mode + ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.f)); // ORCA: Fixes icon rendered without colors while using Light theme if (m_current_tool == tool_ids[i]) { - ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.f, 0.59f, 0.53f, 0.25f)); // ORCA use orca color for selected tool / brush - ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.f, 0.59f, 0.53f, 0.25f)); // ORCA use orca color for selected tool / brush - ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0.f, 0.59f, 0.53f, 0.30f)); // ORCA use orca color for selected tool / brush - ImGui::PushStyleColor(ImGuiCol_Border, ImGuiWrapper::COL_ORCA); // ORCA use orca color for border on selected tool / brush + ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.f, 0.59f, 0.53f, 0.25f)); // ORCA use orca color for selected tool / brush + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.f, 0.59f, 0.53f, 0.25f)); // ORCA use orca color for selected tool / brush + ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0.f, 0.59f, 0.53f, 0.30f)); // ORCA use orca color for selected tool / brush + ImGui::PushStyleColor(ImGuiCol_Border, ImGuiWrapper::COL_ORCA); // ORCA use orca color for border on selected tool / brush ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0); ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 1.0); } @@ -306,7 +307,7 @@ void GLGizmoFdmSupports::on_render_input_window(float x, float y, float bottom_l ImGui::PopStyleColor(4); ImGui::PopStyleVar(2); } - ImGui::PopStyleColor(1); + ImGui::PopStyleColor(2); ImGui::PopStyleVar(1); if (btn_clicked && m_current_tool != tool_ids[i]) { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp index 283ccacb1..3167266a5 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp @@ -514,12 +514,13 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott if (i != 0) ImGui::SameLine((empty_button_width + m_imgui->scaled(1.75f)) * i + m_imgui->scaled(1.5f)); ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0); - ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.f)); // ORCA: Fixes icon rendered without colors while using Light theme + ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.f, 0.f, 0.f, 0.f)); // ORCA Removes button background on dark mode + ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.f)); // ORCA Fixes icon rendered without colors while using Light theme if (m_current_tool == tool_ids[i]) { - ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.f, 0.59f, 0.53f, 0.25f)); // ORCA use orca color for selected tool / brush - ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.f, 0.59f, 0.53f, 0.25f)); // ORCA use orca color for selected tool / brush - ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0.f, 0.59f, 0.53f, 0.30f)); // ORCA use orca color for selected tool / brush - ImGui::PushStyleColor(ImGuiCol_Border, ImGuiWrapper::COL_ORCA); // ORCA use orca color for border on selected tool / brush + ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.f, 0.59f, 0.53f, 0.25f)); // ORCA use orca color for selected tool / brush + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.f, 0.59f, 0.53f, 0.25f)); // ORCA use orca color for selected tool / brush + ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0.f, 0.59f, 0.53f, 0.30f)); // ORCA use orca color for selected tool / brush + ImGui::PushStyleColor(ImGuiCol_Border, ImGuiWrapper::COL_ORCA); // ORCA use orca color for border on selected tool / brush ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0); ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 1.0); } @@ -529,7 +530,7 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott ImGui::PopStyleColor(4); ImGui::PopStyleVar(2); } - ImGui::PopStyleColor(1); + ImGui::PopStyleColor(2); ImGui::PopStyleVar(1); if (btn_clicked && m_current_tool != tool_ids[i]) { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp index 935a76ca0..0f903a0aa 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp @@ -240,12 +240,13 @@ void GLGizmoSeam::on_render_input_window(float x, float y, float bottom_limit) if (i != 0) ImGui::SameLine((empty_button_width + m_imgui->scaled(1.75f)) * i + m_imgui->scaled(1.3f)); ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0); - ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.f)); // ORCA: Fixes icon rendered without colors while using Light theme + ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.f, 0.f, 0.f, 0.f)); // ORCA Removes button background on dark mode + ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.f)); // ORCA: Fixes icon rendered without colors while using Light theme if (m_current_tool == tool_ids[i]) { - ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.f, 0.59f, 0.53f, 0.25f)); // ORCA use orca color for selected tool / brush - ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.f, 0.59f, 0.53f, 0.25f)); // ORCA use orca color for selected tool / brush - ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0.f, 0.59f, 0.53f, 0.30f)); // ORCA use orca color for selected tool / brush - ImGui::PushStyleColor(ImGuiCol_Border, ImGuiWrapper::COL_ORCA); // ORCA use orca color for border on selected tool / brush + ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.f, 0.59f, 0.53f, 0.25f)); // ORCA use orca color for selected tool / brush + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.f, 0.59f, 0.53f, 0.25f)); // ORCA use orca color for selected tool / brush + ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0.f, 0.59f, 0.53f, 0.30f)); // ORCA use orca color for selected tool / brush + ImGui::PushStyleColor(ImGuiCol_Border, ImGuiWrapper::COL_ORCA); // ORCA use orca color for border on selected tool / brush ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0); ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 1.0); } @@ -255,7 +256,7 @@ void GLGizmoSeam::on_render_input_window(float x, float y, float bottom_limit) ImGui::PopStyleColor(4); ImGui::PopStyleVar(2); } - ImGui::PopStyleColor(1); + ImGui::PopStyleColor(2); ImGui::PopStyleVar(1); if (btn_clicked && m_current_tool != tool_ids[i]) { m_current_tool = tool_ids[i]; diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp index 6240d73c3..2595d3804 100644 --- a/src/slic3r/GUI/ImGuiWrapper.cpp +++ b/src/slic3r/GUI/ImGuiWrapper.cpp @@ -163,7 +163,7 @@ const ImVec4 ImGuiWrapper::COL_BUTTON_ACTIVE = COL_BUTTON_HOVERED; //BBS const ImVec4 ImGuiWrapper::COL_BLUE_LIGHT = ImVec4(0.122f, 0.557f, 0.918f, 1.0f); -const ImVec4 ImGuiWrapper::COL_GREEN_LIGHT = ImVec4(0.86f, 0.99f, 0.91f, 1.0f); +const ImVec4 ImGuiWrapper::COL_GREEN_LIGHT = { 0.f, 156 / 255.f, 136 / 255.f, 0.25f }; // ORCA used on various places like text selection bg. Replaced with orca color const ImVec4 ImGuiWrapper::COL_HOVER = { 0.933f, 0.933f, 0.933f, 1.0f }; const ImVec4 ImGuiWrapper::COL_ACTIVE = { 0.675f, 0.675f, 0.675f, 1.0f }; const ImVec4 ImGuiWrapper::COL_SEPARATOR = { 0.93f, 0.93f, 0.93f, 1.0f }; @@ -2585,20 +2585,20 @@ void ImGuiWrapper::push_combo_style(const float scale) ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 1.0f * scale); ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f * scale); ImGui::PushStyleColor(ImGuiCol_PopupBg, ImGuiWrapper::COL_WINDOW_BG_DARK); - ImGui::PushStyleColor(ImGuiCol_BorderActive, COL_ORCA); - ImGui::PushStyleColor(ImGuiCol_HeaderHovered, to_ImVec4(to_rgba(ColorRGB::ORCA(), 0.5f))); + ImGui::PushStyleColor(ImGuiCol_BorderActive, ImVec4(0.f, 150.f / 255.f, 136.f / 255.f, 0.6f)); // ORCA hovered item border color + ImGui::PushStyleColor(ImGuiCol_HeaderHovered, {0.f, 0.f, 0.f, 0.f}); // ORCA hovered item background color ImGui::PushStyleColor(ImGuiCol_HeaderActive, COL_ORCA); - ImGui::PushStyleColor(ImGuiCol_Header, COL_ORCA); + ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(0.f, 150.f / 255.f, 136.f / 255.f, 0.25f)); // ORCA active item background color ImGui::PushStyleColor(ImGuiCol_ScrollbarBg, ImGuiWrapper::COL_WINDOW_BG_DARK); ImGui::PushStyleColor(ImGuiCol_Button, {1.00f, 1.00f, 1.00f, 0.0f}); } else { ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 1.0f * scale); ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f * scale); ImGui::PushStyleColor(ImGuiCol_PopupBg, ImGuiWrapper::COL_WINDOW_BG); - ImGui::PushStyleColor(ImGuiCol_BorderActive, COL_ORCA); - ImGui::PushStyleColor(ImGuiCol_HeaderHovered, to_ImVec4(to_rgba(ColorRGB::ORCA(), 0.5f))); + ImGui::PushStyleColor(ImGuiCol_BorderActive, ImVec4(0.f, 150.f / 255.f, 136.f / 255.f, 0.6f)); // ORCA hovered item border color + ImGui::PushStyleColor(ImGuiCol_HeaderHovered, {0.f, 0.f, 0.f, 0.f}); // ORCA hovered item background color ImGui::PushStyleColor(ImGuiCol_HeaderActive, COL_ORCA); - ImGui::PushStyleColor(ImGuiCol_Header, COL_ORCA); + ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(0.f, 150.f / 255.f, 136.f / 255.f, 0.25f)); // ORCA active item background color ImGui::PushStyleColor(ImGuiCol_ScrollbarBg, ImGuiWrapper::COL_WINDOW_BG); ImGui::PushStyleColor(ImGuiCol_Button, {1.00f, 1.00f, 1.00f, 0.0f}); } diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index bda65536b..9d368f9e8 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -95,8 +95,8 @@ void KBShortcutsDialog::OnSelectTabel(wxCommandEvent &event) while (i != m_hash_selector.end()) { Select *sel = i->second; if (id == sel->m_index) { - sel->m_tab_button->SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#FFFFFF"))); - sel->m_tab_text->SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#FFFFFF"))); + sel->m_tab_button->SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#BFE1DE"))); // ORCA color for selected tab background + sel->m_tab_text->SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#BFE1DE"))); // ORCA color for selected tab background sel->m_tab_text->SetFont(::Label::Head_13); sel->m_tab_button->Refresh(); sel->m_tab_text->Refresh(); diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index 4a1299b11..936afcacb 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -483,7 +483,7 @@ bool OptionsGroup::activate(std::function throw_if_canceled/* = [](){}*/ // BBS: new layout ::StaticLine* stl = new ::StaticLine(m_parent, false, _(title), icon); stl->SetFont(Label::Head_14); - stl->SetForegroundColour("#262E30"); + stl->SetForegroundColour("#363636"); // ORCA Match Parameters title color with tab title color sizer = new wxBoxSizer(wxVERTICAL); if (title.IsEmpty()) { stl->Hide(); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index e810c4d7f..3dd1bb707 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -834,7 +834,7 @@ Sidebar::Sidebar(Plater *parent) p->m_flushing_volume_btn->SetPaddingSize(wxSize(FromDIP(8),FromDIP(3))); p->m_flushing_volume_btn->SetCornerRadius(FromDIP(8)); - StateColor flush_bg_col(std::pair(wxColour(219, 253, 231), StateColor::Pressed), + StateColor flush_bg_col(std::pair(wxColour("#BFE1DE"), StateColor::Pressed), // ORCA std::pair(wxColour(238, 238, 238), StateColor::Hovered), std::pair(wxColour(238, 238, 238), StateColor::Normal)); diff --git a/src/slic3r/GUI/Project.hpp b/src/slic3r/GUI/Project.hpp index 99b081527..0071685e7 100644 --- a/src/slic3r/GUI/Project.hpp +++ b/src/slic3r/GUI/Project.hpp @@ -39,7 +39,7 @@ #define AUFILE_GREY300 wxColour(238, 238, 238) #define AUFILE_GREY200 wxColour(248, 248, 248) #define AUFILE_BRAND wxColour(0, 150, 136) -#define AUFILE_BRAND_TRANSPARENT wxColour(215, 232, 222) +#define AUFILE_BRAND_TRANSPARENT wxColour("#E5F0EE") // ORCA color with %10 opacity //#define AUFILE_PICTURES_SIZE wxSize(FromDIP(300), FromDIP(300)) //#define AUFILE_PICTURES_PANEL_SIZE wxSize(FromDIP(300), FromDIP(340)) #define AUFILE_PICTURES_SIZE wxSize(FromDIP(168), FromDIP(168)) diff --git a/src/slic3r/GUI/Search.cpp b/src/slic3r/GUI/Search.cpp index 5579fb7bc..186124a2c 100644 --- a/src/slic3r/GUI/Search.cpp +++ b/src/slic3r/GUI/Search.cpp @@ -494,7 +494,7 @@ void SearchItem::OnPaint(wxPaintEvent &event) void SearchItem::on_mouse_enter(wxMouseEvent &evt) { - SetBackgroundColour(StateColor::darkModeColorFor(wxColour(238, 238, 238))); + SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#BFE1DE"))); // ORCA color with %25 opacity Refresh(); } @@ -506,7 +506,7 @@ void SearchItem::on_mouse_leave(wxMouseEvent &evt) void SearchItem::on_mouse_left_down(wxMouseEvent &evt) { - SetBackgroundColour(StateColor::darkModeColorFor(wxColour(228, 228, 228))); + SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#BFE1DE"))); // ORCA color with %25 opacity Refresh(); } diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 4638a9a4f..e6b2ac81c 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -4901,7 +4901,7 @@ void EditDevNameDialog::on_edit_name(wxCommandEvent &e) auto size = GetSize(); dc.DrawBitmap(m_bitmap.bmp(), wxPoint(FromDIP(20), (size.y - m_bitmap.GetBmpSize().y) / 2)); dc.SetFont(::Label::Head_13); - dc.SetTextForeground(wxColour(38, 46, 48)); + dc.SetTextForeground(StateColor::darkModeColorFor(wxColour("#262E30"))); // ORCA fix text not visible on dark theme wxString txt = _L("Bind with Pin Code"); auto txt_size = dc.GetTextExtent(txt); dc.DrawText(txt, wxPoint(FromDIP(40), (size.y - txt_size.y) / 2)); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 6db2ff4c3..b4f9959eb 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -272,7 +272,7 @@ void Tab::create_preset_tab() //search input m_search_item = new StaticBox(m_top_panel); StateColor box_colour(std::pair(*wxWHITE, StateColor::Normal)); - StateColor box_border_colour(std::pair(wxColour(238, 238, 238), StateColor::Normal)); + StateColor box_border_colour(std::pair(wxColour("#DBDBDB"), StateColor::Normal)); // ORCA match border color with other input/combo boxes m_search_item->SetBackgroundColor(box_colour); m_search_item->SetBorderColor(box_border_colour); @@ -301,7 +301,7 @@ void Tab::create_preset_tab() if (m_presets_choice) m_presets_choice->Show(); m_btn_save_preset->Show(); - m_btn_delete_preset->Show(); // ORCA: fixes delete preset button visible while search box focused + m_btn_delete_preset->Show(); // ORCA: fixes delete preset button visible while search box focused m_undo_btn->Show(); // ORCA: fixes revert preset button visible while search box focused m_btn_search->Show(); m_search_item->Hide(); @@ -331,7 +331,7 @@ void Tab::create_preset_tab() m_presets_choice->Hide(); m_btn_save_preset->Hide(); - m_btn_delete_preset->Hide(); // ORCA: fixes delete preset button visible while search box focused + m_btn_delete_preset->Hide(); // ORCA: fixes delete preset button visible while search box focused m_undo_btn->Hide(); // ORCA: fixes revert preset button visible while search box focused m_btn_search->Hide(); m_search_item->Show(); diff --git a/src/slic3r/GUI/TabButton.cpp b/src/slic3r/GUI/TabButton.cpp index 04742223c..49c153c28 100644 --- a/src/slic3r/GUI/TabButton.cpp +++ b/src/slic3r/GUI/TabButton.cpp @@ -17,7 +17,7 @@ END_EVENT_TABLE() static wxColour BORDER_HOVER_COL = wxColour(0, 150, 136); const static wxColour TAB_BUTTON_BG = wxColour("#FEFFFF"); -const static wxColour TAB_BUTTON_SEL = wxColour(219, 253, 213, 255); +const static wxColour TAB_BUTTON_SEL = wxColour("#BFE1DE"); // ORCA TabButton::TabButton() : paddingSize(43, 16) @@ -29,7 +29,7 @@ TabButton::TabButton() std::make_pair(wxColour("#FEFFFF"), (int) StateColor::Normal)); border_color = StateColor( - std::make_pair(wxColour("#FEFFFF"), (int) StateColor::Checked), + std::make_pair(TAB_BUTTON_SEL, (int) StateColor::Checked), // ORCA use same color for border to prevent 1px blank border std::make_pair(BORDER_HOVER_COL, (int) StateColor::Hovered), std::make_pair(wxColour("#FEFFFF"), (int)StateColor::Normal)); } diff --git a/src/slic3r/GUI/Tabbook.cpp b/src/slic3r/GUI/Tabbook.cpp index 9b3174540..cda915ba7 100644 --- a/src/slic3r/GUI/Tabbook.cpp +++ b/src/slic3r/GUI/Tabbook.cpp @@ -15,7 +15,7 @@ wxDEFINE_EVENT(wxCUSTOMEVT_TABBOOK_SEL_CHANGED, wxCommandEvent); const static wxColour TAB_BUTTON_BG = wxColour("#FEFFFF"); -const static wxColour TAB_BUTTON_SEL = wxColour(219, 253, 213, 255); +const static wxColour TAB_BUTTON_SEL = wxColour("#BFE1DE"); // ORCA static const wxFont& TAB_BUTTON_FONT = Label::Body_14; static const wxFont& TAB_BUTTON_FONT_SEL = Label::Head_14; diff --git a/src/slic3r/GUI/Widgets/ComboBox.cpp b/src/slic3r/GUI/Widgets/ComboBox.cpp index 79ae2fc8b..55b8e12bc 100644 --- a/src/slic3r/GUI/Widgets/ComboBox.cpp +++ b/src/slic3r/GUI/Widgets/ComboBox.cpp @@ -58,7 +58,7 @@ ComboBox::ComboBox(wxWindow *parent, std::make_pair(0xE5F0EE, (int) StateColor::Focused), // ORCA updated background color for focused item std::make_pair(*wxWHITE, (int) StateColor::Normal))); TextInput::SetLabelColor(StateColor( - std::make_pair(wxColour("#ACACAC"), (int) StateColor::Disabled), // ORCA: Use same color for disabled text on combo boxes + std::make_pair(0x6B6B6B, (int) StateColor::Disabled), // ORCA: Use same color for disabled text on combo boxes std::make_pair(0x262E30, (int) StateColor::Normal))); } if (auto scroll = GetScrollParent(this)) diff --git a/src/slic3r/GUI/Widgets/SpinInput.cpp b/src/slic3r/GUI/Widgets/SpinInput.cpp index 795b38df8..5c8b91a0c 100644 --- a/src/slic3r/GUI/Widgets/SpinInput.cpp +++ b/src/slic3r/GUI/Widgets/SpinInput.cpp @@ -21,8 +21,8 @@ END_EVENT_TABLE() */ SpinInput::SpinInput() - : label_color(std::make_pair(0x909090, (int) StateColor::Disabled), std::make_pair(0x6B6B6B, (int) StateColor::Normal)) - , text_color(std::make_pair(0x909090, (int) StateColor::Disabled), std::make_pair(0x262E30, (int) StateColor::Normal)) + : label_color(std::make_pair(0x6B6B6B, (int) StateColor::Disabled), std::make_pair(0x6B6B6B, (int) StateColor::Normal)) + , text_color(std::make_pair(0x6B6B6B, (int) StateColor::Disabled), std::make_pair(0x262E30, (int) StateColor::Normal)) { radius = 0; border_width = 1; diff --git a/src/slic3r/GUI/Widgets/StateColor.cpp b/src/slic3r/GUI/Widgets/StateColor.cpp index 9038d9c62..f2e1b0702 100644 --- a/src/slic3r/GUI/Widgets/StateColor.cpp +++ b/src/slic3r/GUI/Widgets/StateColor.cpp @@ -6,43 +6,43 @@ static bool gDarkMode = false; static bool operator<(wxColour const &l, wxColour const &r) { return l.GetRGBA() < r.GetRGBA(); } static std::map gDarkColors{ - {"#009688", "#00675b"}, - {"#1F8EEA", "#2778D2"}, - {"#FF6F00", "#D15B00"}, - {"#D01B1B", "#BB2A3A"}, - {"#262E30", "#EFEFF0"}, - {"#2C2C2E", "#B3B3B4"}, - {"#6B6B6B", "#818183"}, - {"#ACACAC", "#54545A"}, - {"#EEEEEE", "#4C4C55"}, - {"#E8E8E8", "#3E3E45"}, - {"#323A3D", "#E5E5E4"}, - {"#FFFFFF", "#2D2D31"}, - {"#F8F8F8", "#36363C"}, - {"#F1F1F1", "#36363B"}, - {"#3B4446", "#2D2D30"}, - {"#CECECE", "#54545B"}, - {"#DBFDD5", "#3B3B40"}, - {"#000000", "#FFFFFE"}, - {"#F4F4F4", "#36363D"}, - {"#DBDBDB", "#4A4A51"}, - {"#EDFAF2", "#283232"}, - {"#323A3C", "#E5E5E6"}, - {"#6B6B6A", "#B3B3B5"}, - {"#303A3C", "#E5E5E5"}, - {"#FEFFFF", "#242428"}, - {"#A6A9AA", "#2D2D29"}, - {"#363636", "#B2B3B5"}, - {"#F0F0F1", "#404040"}, - {"#9E9E9E", "#53545A"}, - {"#D7E8DE", "#1F2B27"}, - {"#2B3436", "#808080"}, + {"#009688", "#00675b"}, // rgb(0, 150, 136) ORCA color + {"#1F8EEA", "#2778D2"}, // rgb(31, 142, 234) ??? + {"#FF6F00", "#D15B00"}, // rgb(255, 111, 0) Secondary color + {"#D01B1B", "#BB2A3A"}, // rgb(208, 27, 27) ??? + {"#262E30", "#EFEFF0"}, // rgb(38, 46, 48) Button text color | Input Text Color + {"#2C2C2E", "#B3B3B4"}, // rgb(44, 44, 46) ??? + {"#6B6B6B", "#818183"}, // rgb(107, 107, 107) Disabled Text + {"#ACACAC", "#65656A"}, // rgb(172, 172, 172) Disabled Text on boxes | Dimmed Elements + {"#EEEEEE", "#4C4C55"}, // rgb(238, 238, 238) Separator Line | Title Line Color + {"#E8E8E8", "#3E3E45"}, // rgb(232, 232, 232) ??? + {"#323A3D", "#E5E5E4"}, // rgb(50, 58, 61) Softer text color + {"#FFFFFF", "#2D2D31"}, // rgb(255, 255, 255) Window background + {"#F8F8F8", "#36363C"}, // rgb(248, 248, 248) Sidebar > Titlebar > Gradient Top | BBL monitor page titlebar bg + {"#F1F1F1", "#36363B"}, // rgb(241, 241, 241) Sidebar > Titlebar > Gradient Bottom + {"#3B4446", "#2D2D30"}, // rgb(59, 68, 78) Top Bar / Main tab bar bg color + {"#CECECE", "#54545B"}, // rgb(206, 206, 206) Sidebar wxPanel bg | + {"#DBFDD5", "#3B3B40"}, // rgb(219, 253, 213) Not Used anymore // Was used for BBS combo boxes etc + {"#000000", "#FFFFFE"}, // rgb(0, 0, 0) Mostly Text color wxBlack + {"#F4F4F4", "#36363D"}, // rgb(244, 244, 244) ??? + {"#DBDBDB", "#4A4A51"}, // rgb(219, 219, 219) Input/Combo Box Border Color + {"#EDFAF2", "#283232"}, // rgb(229, 240, 238) Not Used anymore // Was used for BBS Combo / Dropdown focused background color + {"#323A3C", "#E5E5E6"}, // rgb(50, 58, 60) Text color used on search list | + {"#6B6B6A", "#B3B3B5"}, // rgb(107, 107, 106) Button Dimmed text | Input box side text + {"#303A3C", "#E5E5E5"}, // rgb(48, 58, 60) Object Table > Column header text color | StaticBox Border Color + {"#FEFFFF", "#242428"}, // rgb(254, 255, 255) Side Tabbar bg | + {"#A6A9AA", "#2D2D29"}, // rgb(166, 169, 170) Seperator color + {"#363636", "#B2B3B5"}, // rgb(54, 54, 54) Sidebar > Parameter Label/Title color | Sidebar tab text | Create Filament window text + {"#F0F0F1", "#333337"}, // rgb(240, 240, 241) Disabled element background // ORCA Used better background color for dark mode + {"#9E9E9E", "#53545A"}, // rgb(158, 158, 158) ??? + {"#D7E8DE", "#1F2B27"}, // rgb(215, 232, 222) Not Used anymore // Leftover from BBS + {"#2B3436", "#808080"}, // rgb(43, 52, 54) Not Used anymore // Leftover from BBS. Was used as main fill color of icons {"#ABABAB", "#ABABAB"}, - {"#D9D9D9", "#2D2D32"}, + {"#D9D9D9", "#2D2D32"}, // rgb(217, 217, 217) Sidebar > Toggle button track color //{"#F0F0F0", "#4C4C54"}, - // ORCA - {"#BFE1DE", "#223C3C"}, // rgb(191, 225, 222) Dropdown checked item background color > ORCA color with %25 opacity - {"#E5F0EE", "#283232"}, // rgb(229, 240, 238) Combo / Dropdown focused background color > ORCA color with %10 opacity + // ORCA + {"#BFE1DE", "#223C3C"}, // rgb(191, 225, 222) Dropdown checked item background color > ORCA color with %25 opacity + {"#E5F0EE", "#283232"}, // rgb(229, 240, 238) Combo / Dropdown focused background color > ORCA color with %10 opacity }; std::tuple StateColor::GetLAB(const wxColour& color) { diff --git a/src/slic3r/GUI/Widgets/TabCtrl.cpp b/src/slic3r/GUI/Widgets/TabCtrl.cpp index 36778f681..73d792a4e 100644 --- a/src/slic3r/GUI/Widgets/TabCtrl.cpp +++ b/src/slic3r/GUI/Widgets/TabCtrl.cpp @@ -304,7 +304,7 @@ void TabCtrl::doRender(wxDC& dc) #else dc.SetPen(wxPen(border_color.colorForStates(states), border_width)); dc.DrawLine(0, size.y - BS2, size.x, size.y - BS2); - wxColour c(0xf2, 0x75, 0x4e, 0xff); + wxColour c("#009688"); // ORCA selected tab underline stroke color dc.SetPen(wxPen(c, 1)); dc.SetBrush(c); dc.DrawRoundedRectangle(x1 - radius, size.y - BS2 - border_width * 3, x2 + radius * 2 - x1, border_width * 3, radius); diff --git a/src/slic3r/GUI/Widgets/TextInput.cpp b/src/slic3r/GUI/Widgets/TextInput.cpp index 6e1c0f11e..0aaeaa23d 100644 --- a/src/slic3r/GUI/Widgets/TextInput.cpp +++ b/src/slic3r/GUI/Widgets/TextInput.cpp @@ -19,9 +19,9 @@ END_EVENT_TABLE() */ TextInput::TextInput() - : label_color(std::make_pair(0x909090, (int) StateColor::Disabled), + : label_color(std::make_pair(0x6B6B6B, (int) StateColor::Disabled), std::make_pair(0x6B6B6B, (int) StateColor::Normal)) - , text_color(std::make_pair(0x909090, (int) StateColor::Disabled), + , text_color(std::make_pair(0x6B6B6B, (int) StateColor::Disabled), std::make_pair(0x262E30, (int) StateColor::Normal)) { radius = 0;