mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: [STUDIO-1565] adjust ui style of media file buttons 

Change-Id: Ia3598ca8a15e357021d8b74f645f4d34a853dd91
This commit is contained in:
chunmao.guo 2022-12-02 13:11:01 +08:00 committed by Lane.Wei
parent 5a6263c9f3
commit 36efeea30b
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/ImageGrid.cpp
View File

@ -623,10 +623,13 @@ void Slic3r::GUI::ImageGrid::renderButtons(wxDC &dc, wxStringList const &texts,
// Draw button background // Draw button background
//dc.Blit(rect.GetTopLeft(), rect.GetSize(), &mdc, {m_buttonBackgroundColor.colorIndexForStates(states) * 128, 0}); //dc.Blit(rect.GetTopLeft(), rect.GetSize(), &mdc, {m_buttonBackgroundColor.colorIndexForStates(states) * 128, 0});
//dc.DrawBitmap(m_button_background, rect2.GetTopLeft()); //dc.DrawBitmap(m_button_background, rect2.GetTopLeft());
// Draw button splitter
if (i > 0) dc.DrawLine(rect.GetLeftTop(), rect.GetLeftBottom());
// Draw button text
rect.Deflate(10, 5); rect.Deflate(10, 5);
// Draw button splitter
auto pen = dc.GetPen();
dc.SetPen(wxPen("#616161"));
if (i > 0) dc.DrawLine(rect.GetLeftTop(), rect.GetLeftBottom());
dc.SetPen(pen);
// Draw button text
renderText(dc, texts[i], rect, states | states2); renderText(dc, texts[i], rect, states | states2);
rect.Inflate(10, 5); rect.Inflate(10, 5);
rect.Offset(rect.GetWidth(), 0); rect.Offset(rect.GetWidth(), 0);

2
src/slic3r/GUI/ParamsPanel.cpp
View File

@ -703,7 +703,7 @@ void ParamsPanel::notify_object_config_changed()
if (has_config == m_has_object_config) return; if (has_config == m_has_object_config) return;
m_has_object_config = has_config; m_has_object_config = has_config;
if (has_config) if (has_config)
m_mode_region->SetTextColor2(StateColor(std::pair{*wxWHITE, (int) StateColor::Checked}, std::pair{wxGetApp().get_label_clr_modified(), 0})); m_mode_region->SetTextColor2(StateColor(std::pair{0xfffffe, (int) StateColor::Checked}, std::pair{wxGetApp().get_label_clr_modified(), 0}));
else else
m_mode_region->SetTextColor2(StateColor()); m_mode_region->SetTextColor2(StateColor());
m_mode_region->Rescale(); m_mode_region->Rescale();

2
src/slic3r/GUI/Widgets/SwitchButton.cpp
View File

@ -11,7 +11,7 @@ SwitchButton::SwitchButton(wxWindow* parent, wxWindowID id)
: wxBitmapToggleButton(parent, id, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE | wxBU_EXACTFIT) : wxBitmapToggleButton(parent, id, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE | wxBU_EXACTFIT)
, m_on(this, "toggle_on", 16) , m_on(this, "toggle_on", 16)
, m_off(this, "toggle_off", 16) , m_off(this, "toggle_off", 16)
, text_color(std::pair{*wxWHITE, (int) StateColor::Checked}, std::pair{0x6B6B6B, (int) StateColor::Normal}) , text_color(std::pair{0xfffffe, (int) StateColor::Checked}, std::pair{0x6B6B6B, (int) StateColor::Normal})
, track_color(0xD9D9D9) , track_color(0xD9D9D9)
, thumb_color(std::pair{0x00AE42, (int) StateColor::Checked}, std::pair{0xD9D9D9, (int) StateColor::Normal}) , thumb_color(std::pair{0x00AE42, (int) StateColor::Checked}, std::pair{0xD9D9D9, (int) StateColor::Normal})
{ {