3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-25 15:44:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Color fixes (#5239)

Browse source 
* Update plate name & number colors

* Update sliced plates selected item border color and "All Plates Stats" text color

* Simplify gizmo update slider thumb and text color

* Update confirm button hover color

* Fix assembly info titlebar not compatible with dark mode

* Update selected tab color on set filaments to use window

* Update gCode viewer text colors

* Update color of selection rectangle

* Update gcode view slider value text color

* Paint gizmos update colors for tool / brush buttons

* Update colors of gizmo radio buttons

* Update combined slider thumb color for gizmos

* Update header color for gizmos

* Update titlebar buttons background color while hover

* Fix side bar header background not uses correct color for dark theme

* Update background colors of focused Combo box and  checked item on Dropdown

* Revert changes for gCode Window text colors

* Revert changes for plate name / number text color

* Update background color of Sliced Plates list > Scrollbar

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
yw4z 2024-05-06 17:41:28 +03:00 • committed by GitHub
parent a5cb28d358
commit e40d7780d5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 55 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/Widgets/ComboBox.cpp
View file

@ -55,7 +55,7 @@ ComboBox::ComboBox(wxWindow *parent,
std::make_pair(0x009688, (int) StateColor::Hovered),
std::make_pair(0xDBDBDB, (int) StateColor::Normal)));
TextInput::SetBackgroundColor(StateColor(std::make_pair(0xF0F0F1, (int) StateColor::Disabled),
std::make_pair(0xEDFAF2, (int) StateColor::Focused),
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(0x909090, (int) StateColor::Disabled),
std::make_pair(0x262E30, (int) StateColor::Normal)));

2
src/slic3r/GUI/Widgets/DropDown.cpp
View file

@ -41,7 +41,7 @@ DropDown::DropDown(std::vector<wxString> &texts,
, text_color(0x363636)
, selector_border_color(std::make_pair(0x009688, (int) StateColor::Hovered),
std::make_pair(*wxWHITE, (int) StateColor::Normal))
, selector_background_color(std::make_pair(0xEDFAF2, (int) StateColor::Checked),
, selector_background_color(std::make_pair(0xBFE1DE, (int) StateColor::Checked), // ORCA updated background color for checked item
std::make_pair(*wxWHITE, (int) StateColor::Normal))
{
}

4
src/slic3r/GUI/Widgets/SideTools.cpp
View file

@ -146,8 +146,8 @@ void SideToolsPanel::doRender(wxDC &dc)
//}
if (m_none_printer) {
dc.SetPen(SIDE_TOOLS_BRAND);
dc.SetBrush(SIDE_TOOLS_BRAND);
dc.SetPen(StateColor::darkModeColorFor(SIDE_TOOLS_BRAND)); // ORCA: Sidebar header background color - Fix for dark mode compability
dc.SetBrush(StateColor::darkModeColorFor(SIDE_TOOLS_BRAND)); // ORCA: Sidebar header background color - Fix for dark mode compability
dc.DrawRectangle(0, 0, size.x, size.y);
dc.DrawBitmap(m_none_printing_img.bmp(), left, (size.y - m_none_printing_img.GetBmpSize().y) / 2);

3
src/slic3r/GUI/Widgets/StateColor.cpp
View file

@ -40,6 +40,9 @@ static std::map<wxColour, wxColour> gDarkColors{
{"#ABABAB", "#ABABAB"},
{"#D9D9D9", "#2D2D32"},
//{"#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
};
std::tuple<double, double, double> StateColor::GetLAB(const wxColour& color) {