Merge branch 'main' into feature/multitool

This commit is contained in:
SoftFever 2024-07-23 18:21:19 +08:00 committed by GitHub
commit ff10d5f661
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 111 additions and 97 deletions

View file

@ -890,7 +890,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, int>(wxColour(219, 253, 231), StateColor::Pressed),
StateColor flush_bg_col(std::pair<wxColour, int>(wxColour("#BFE1DE"), StateColor::Pressed), // ORCA
std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Normal));