From 86490d4cef4b2417e8fe5f5db291e91916f03439 Mon Sep 17 00:00:00 2001
From: tao wang <tao.wang@bambulab.com>
Date: Thu, 12 Jan 2023 10:30:57 +0800
Subject: [PATCH] FIX:Fixed some UI layout issues for monitor page

Change-Id: I91fc50b63ff79ef7e9b7df600325a619c6764a09
---
 src/slic3r/GUI/AmsMappingPopup.cpp    | 2 +-
 src/slic3r/GUI/StatusPanel.cpp        | 1 +
 src/slic3r/GUI/Widgets/AMSControl.cpp | 8 ++++----
 src/slic3r/GUI/Widgets/StateColor.cpp | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp
index 4ad6a6f22..8d82d1617 100644
--- a/src/slic3r/GUI/AmsMappingPopup.cpp
+++ b/src/slic3r/GUI/AmsMappingPopup.cpp
@@ -933,7 +933,7 @@ AmsIntroducePopup::AmsIntroducePopup(wxWindow* parent)
 
     m_staticText_top = new Label(this, _L("Do not Enable AMS"));
     m_staticText_top->SetFont(::Label::Head_13);
-    m_staticText_top->SetForegroundColour(wxColour(0x323A3D));
+   // m_staticText_top->SetForegroundColour(wxColour(0x323A3D));
     m_staticText_top->Wrap(-1);
     bSizer4->Add(m_staticText_top, 0, wxALL, 5);
 
diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp
index f213a5ecf..2cadea6a1 100644
--- a/src/slic3r/GUI/StatusPanel.cpp
+++ b/src/slic3r/GUI/StatusPanel.cpp
@@ -1100,6 +1100,7 @@ void StatusBasePanel::show_ams_group(bool show, bool support_virtual_tray)
     m_ams_control->Show(true);
     m_ams_control_box->Show(true);
     m_ams_control->show_noams_mode(show, support_virtual_tray);
+
     if (m_show_ams_group != show) {
         Fit();
     }
diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp
index 3924c198a..b41401317 100644
--- a/src/slic3r/GUI/Widgets/AMSControl.cpp
+++ b/src/slic3r/GUI/Widgets/AMSControl.cpp
@@ -1541,8 +1541,9 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
     m_sizer_ams_tips = new wxBoxSizer(wxHORIZONTAL);
     auto m_ams_tip = new wxStaticText(m_amswin, wxID_ANY, _L("AMS"));
     m_ams_tip->SetFont(::Label::Body_12);
-    m_ams_tip->SetForegroundColour(wxColour(0x323A3D));
+    m_ams_tip->SetBackgroundColour(*wxWHITE);
     auto img_amsmapping_tip = new wxStaticBitmap(m_amswin, wxID_ANY, create_scaled_bitmap("enable_ams", this, 16), wxDefaultPosition, wxSize(FromDIP(16), FromDIP(16)), 0);
+    img_amsmapping_tip->SetBackgroundColour(*wxWHITE);
     m_sizer_ams_tips->Add(m_ams_tip, 0, wxALIGN_CENTER, 0);
     m_sizer_ams_tips->Add(img_amsmapping_tip, 0, wxALL, FromDIP(2));
 
@@ -1691,7 +1692,6 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
     auto vams_panel = new wxWindow(m_panel_virtual, wxID_ANY);
     vams_panel->SetBackgroundColour(AMS_CONTROL_DEF_BLOCK_BK_COLOUR);
     //m_vams_refresh = new AMSrefresh(vams_panel, wxID_ANY, 0, m_vams_info);
-
     m_vams_lib = new AMSLib(vams_panel, wxID_ANY, m_vams_info);
     m_vams_road = new AMSRoad(vams_panel, wxID_ANY, m_vams_info, -1, -1, wxDefaultPosition, AMS_CAN_ROAD_SIZE);
 
@@ -1740,9 +1740,9 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
     m_sizer_vams_tips = new wxBoxSizer(wxHORIZONTAL);
     auto m_vams_tip = new wxStaticText(m_amswin, wxID_ANY, _L("Ext Spool"));
     m_vams_tip->SetFont(::Label::Body_12);
-    m_vams_tip->SetForegroundColour(wxColour(0x323A3D));
+    m_vams_tip->SetBackgroundColour(*wxWHITE);
     auto img_vams_tip = new wxStaticBitmap(m_amswin, wxID_ANY, create_scaled_bitmap("enable_ams", this, 16), wxDefaultPosition, wxSize(FromDIP(16), FromDIP(16)), 0);
-
+    img_vams_tip->SetBackgroundColour(*wxWHITE);
     img_vams_tip->Bind(wxEVT_ENTER_WINDOW, [this, img_vams_tip](auto& e) {
         wxPoint img_pos = img_vams_tip->ClientToScreen(wxPoint(0, 0));
         wxPoint popup_pos(img_pos.x, img_pos.y + img_vams_tip->GetRect().height);
diff --git a/src/slic3r/GUI/Widgets/StateColor.cpp b/src/slic3r/GUI/Widgets/StateColor.cpp
index 5145669de..61cc39355 100644
--- a/src/slic3r/GUI/Widgets/StateColor.cpp
+++ b/src/slic3r/GUI/Widgets/StateColor.cpp
@@ -38,7 +38,7 @@ static std::map<wxColour, wxColour> gDarkColors{
     {"#2B3436", "#808080"},
     {"#ABABAB", "#ABABAB"},
     {"#D9D9D9", "#2D2D32"},
-    //{"#F0F0F0", "#3E3E44"},
+    //{"#F0F0F0", "#4C4C54"},
 };
 
 std::map<wxColour, wxColour> const & StateColor::GetDarkMap()