From fa91174af2e04b1208b86c1d671e66f77ff27edb Mon Sep 17 00:00:00 2001
From: "chunmao.guo" <chunmao.guo@bambulab.com>
Date: Wed, 7 Jun 2023 14:04:09 +0800
Subject: [PATCH] FIX: [STUDIO-3027] media file dark mode ui

Change-Id: I1b611392d0fa82471ffe9a8043c32931f8be325d
---
 src/slic3r/GUI/ImageGrid.cpp      | 13 ++++++++++---
 src/slic3r/GUI/MediaFilePanel.cpp |  5 +++--
 src/slic3r/GUI/Monitor.cpp        |  1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/slic3r/GUI/ImageGrid.cpp b/src/slic3r/GUI/ImageGrid.cpp
index 236faf5bf..02cd827cc 100644
--- a/src/slic3r/GUI/ImageGrid.cpp
+++ b/src/slic3r/GUI/ImageGrid.cpp
@@ -120,6 +120,8 @@ void Slic3r::GUI::ImageGrid::DoActionOnSelection(int action) { DoAction(-1, acti
 
 void Slic3r::GUI::ImageGrid::Rescale()
 {
+    m_title_mask = wxBitmap();
+    m_border_mask = wxBitmap();
     UpdateFileSystem();
     auto em              = em_unit(this);
     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)
         m_title_mask = createAlphaBitmap(title_mask_size, 0x6f6f6f, 255, 0);
     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();
     Refresh();
 }
@@ -641,14 +643,19 @@ void Slic3r::GUI::ImageGrid::renderContent2(wxDC &dc, wxPoint const &pt, int ind
     // Draw thumbnail & buttons
     int h = m_content_rect.GetHeight() * 64 / 264;
     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
     renderContent1(dc, pt, index, hit);
     m_content_rect.SetHeight(m_content_rect.GetHeight() + h);
     // Draw info bar
-    auto br = dc.GetBrush();
-    dc.SetBrush(*wxWHITE);
+    dc.SetBrush(StateColor::darkModeColorFor(*wxWHITE));
+    dc.SetPen(StateColor::darkModeColorFor(*wxWHITE));
     dc.DrawRectangle(pt.x, pt.y + m_content_rect.GetHeight() - h, m_content_rect.GetWidth(), h);
     dc.SetBrush(br);
+    dc.SetPen(pn);
     // Draw infos
     dc.SetFont(Label::Head_16);
     dc.SetTextForeground(StateColor::darkModeColorFor("#323A3D"));
diff --git a/src/slic3r/GUI/MediaFilePanel.cpp b/src/slic3r/GUI/MediaFilePanel.cpp
index df5e44083..13b707e19 100644
--- a/src/slic3r/GUI/MediaFilePanel.cpp
+++ b/src/slic3r/GUI/MediaFilePanel.cpp
@@ -38,9 +38,10 @@ MediaFilePanel::MediaFilePanel(wxWindow * parent)
 
     // Time group
     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->SetBackgroundColor(StateColor());
-    m_button_year = new ::Button(m_time_panel, _L("Year"), "", wxBORDER_NONE);
+    m_time_panel->SetCornerRadius(0);
+    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_all = new ::Button(m_time_panel, _L("All Files"), "", wxBORDER_NONE);
     m_button_year->SetToolTip(_L("Group files by year, recent first."));
diff --git a/src/slic3r/GUI/Monitor.cpp b/src/slic3r/GUI/Monitor.cpp
index 0f58dbc2d..0ccb6ef87 100644
--- a/src/slic3r/GUI/Monitor.cpp
+++ b/src/slic3r/GUI/Monitor.cpp
@@ -394,6 +394,7 @@ void MonitorPanel::on_sys_color_changed()
 {
     m_status_info_panel->on_sys_color_changed();
     m_upgrade_panel->on_sys_color_changed();
+    m_media_file_panel->Rescale();
 }
 
 void MonitorPanel::msw_rescale()