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

FIX: [STUDIO-3027] media file dark mode ui 

Change-Id: I1b611392d0fa82471ffe9a8043c32931f8be325d
This commit is contained in:
chunmao.guo 2023-06-07 14:04:09 +08:00 committed by Lane.Wei
parent cc33bb90ca
commit fa91174af2
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,6 +120,8 @@ void Slic3r::GUI::ImageGrid::DoActionOnSelection(int action) { DoAction(-1, acti
void Slic3r::GUI::ImageGrid::Rescale() void Slic3r::GUI::ImageGrid::Rescale()
{ {
m_title_mask = wxBitmap();
m_border_mask = wxBitmap();
UpdateFileSystem(); UpdateFileSystem();
auto em = em_unit(this); auto em = em_unit(this);
wxSize size1{384 * em / 10, 4 * em}; wxSize size1{384 * em / 10, 4 * em};
@ -211,7 +213,7 @@ void ImageGrid::UpdateLayout()
if (!m_title_mask.IsOk() || m_title_mask.GetSize() != title_mask_size) if (!m_title_mask.IsOk() || m_title_mask.GetSize() != title_mask_size)
m_title_mask = createAlphaBitmap(title_mask_size, 0x6f6f6f, 255, 0); m_title_mask = createAlphaBitmap(title_mask_size, 0x6f6f6f, 255, 0);
if (!m_border_mask.IsOk() || m_border_mask.GetSize() != m_border_size) if (!m_border_mask.IsOk() || m_border_mask.GetSize() != m_border_size)
m_border_mask = createShadowBorder(m_border_size, GetBackgroundColour(), em_unit(this), 3); m_border_mask = createShadowBorder(m_border_size, StateColor::darkModeColorFor(0xEEEEEE), em_unit(this), 3);
UpdateFocusRange(); UpdateFocusRange();
Refresh(); Refresh();
} }
@ -641,14 +643,19 @@ void Slic3r::GUI::ImageGrid::renderContent2(wxDC &dc, wxPoint const &pt, int ind
// Draw thumbnail & buttons // Draw thumbnail & buttons
int h = m_content_rect.GetHeight() * 64 / 264; int h = m_content_rect.GetHeight() * 64 / 264;
m_content_rect.SetHeight(m_content_rect.GetHeight() - h); m_content_rect.SetHeight(m_content_rect.GetHeight() - h);
auto br = dc.GetBrush();
auto pn = dc.GetPen();
dc.SetBrush(StateColor::darkModeColorFor(0xEEEEEE));
dc.SetPen(StateColor::darkModeColorFor(0xEEEEEE));
dc.DrawRectangle(pt, m_content_rect.GetSize()); // Fix translucent model thumbnail dc.DrawRectangle(pt, m_content_rect.GetSize()); // Fix translucent model thumbnail
renderContent1(dc, pt, index, hit); renderContent1(dc, pt, index, hit);
m_content_rect.SetHeight(m_content_rect.GetHeight() + h); m_content_rect.SetHeight(m_content_rect.GetHeight() + h);
// Draw info bar // Draw info bar
auto br = dc.GetBrush(); dc.SetBrush(StateColor::darkModeColorFor(*wxWHITE));
dc.SetBrush(*wxWHITE); dc.SetPen(StateColor::darkModeColorFor(*wxWHITE));
dc.DrawRectangle(pt.x, pt.y + m_content_rect.GetHeight() - h, m_content_rect.GetWidth(), h); dc.DrawRectangle(pt.x, pt.y + m_content_rect.GetHeight() - h, m_content_rect.GetWidth(), h);
dc.SetBrush(br); dc.SetBrush(br);
dc.SetPen(pn);
// Draw infos // Draw infos
dc.SetFont(Label::Head_16); dc.SetFont(Label::Head_16);
dc.SetTextForeground(StateColor::darkModeColorFor("#323A3D")); dc.SetTextForeground(StateColor::darkModeColorFor("#323A3D"));

5
src/slic3r/GUI/MediaFilePanel.cpp
View File

@ -38,9 +38,10 @@ MediaFilePanel::MediaFilePanel(wxWindow * parent)
// Time group // Time group
auto time_panel = new wxWindow(this, wxID_ANY); auto time_panel = new wxWindow(this, wxID_ANY);
time_panel->SetBackgroundColour(0xEEEEEE);
m_time_panel = new ::StaticBox(time_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE); m_time_panel = new ::StaticBox(time_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
m_time_panel->SetBackgroundColor(StateColor()); m_time_panel->SetCornerRadius(0);
m_button_year = new ::Button(m_time_panel, _L("Year"), "", wxBORDER_NONE); m_button_year = new ::Button(m_time_panel, _L("Year"), "", wxBORDER_NONE);
m_button_month = new ::Button(m_time_panel, _L("Month"), "", wxBORDER_NONE); m_button_month = new ::Button(m_time_panel, _L("Month"), "", wxBORDER_NONE);
m_button_all = new ::Button(m_time_panel, _L("All Files"), "", wxBORDER_NONE); m_button_all = new ::Button(m_time_panel, _L("All Files"), "", wxBORDER_NONE);
m_button_year->SetToolTip(_L("Group files by year, recent first.")); m_button_year->SetToolTip(_L("Group files by year, recent first."));

1
src/slic3r/GUI/Monitor.cpp
View File

@ -394,6 +394,7 @@ void MonitorPanel::on_sys_color_changed()
{ {
m_status_info_panel->on_sys_color_changed(); m_status_info_panel->on_sys_color_changed();
m_upgrade_panel->on_sys_color_changed(); m_upgrade_panel->on_sys_color_changed();
m_media_file_panel->Rescale();
} }
void MonitorPanel::msw_rescale() void MonitorPanel::msw_rescale()