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

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

14
src/slic3r/GUI/BBLTopbar.cpp
View file

@ -134,19 +134,19 @@ void BBLTopbarArt::DrawButton(wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& i
{
if (item.GetState() & wxAUI_BUTTON_STATE_PRESSED)
{
dc.SetPen(wxPen(m_highlightColour));
dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(20)));
dc.SetPen(wxPen(StateColor::darkModeColorFor("#009688"))); // ORCA
dc.SetBrush(wxBrush(StateColor::darkModeColorFor("#009688"))); // ORCA
dc.DrawRectangle(rect);
}
else if ((item.GetState() & wxAUI_BUTTON_STATE_HOVER) || item.IsSticky())
{
dc.SetPen(wxPen(m_highlightColour));
dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(40)));
dc.SetPen(wxPen(StateColor::darkModeColorFor("#009688"))); // ORCA
dc.SetBrush(wxBrush(StateColor::darkModeColorFor("#009688"))); // ORCA
// draw an even lighter background for checked item hovers (since
// the hover background is the same color as the check background)
if (item.GetState() & wxAUI_BUTTON_STATE_CHECKED)
dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(50)));
dc.SetBrush(wxBrush(StateColor::darkModeColorFor("#009688"))); // ORCA
dc.DrawRectangle(rect);
}
@ -154,8 +154,8 @@ void BBLTopbarArt::DrawButton(wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& i
{
// it's important to put this code in an else statement after the
// hover, otherwise hovers won't draw properly for checked items
dc.SetPen(wxPen(m_highlightColour));
dc.SetBrush(wxBrush(m_highlightColour.ChangeLightness(40)));
dc.SetPen(wxPen(StateColor::darkModeColorFor("#009688"))); // ORCA
dc.SetBrush(wxBrush(StateColor::darkModeColorFor("#009688"))); // ORCA
dc.DrawRectangle(rect);
}
}