From e59fe6511d410200decc70fc42284b015e7c6f7e Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Thu, 8 Dec 2022 15:57:13 +0800 Subject: [PATCH] FIX: [STUDIO-1638] transparent background for Notebook Change-Id: If849fe43349f87be66b53af48737a9a2c50aa237 --- src/slic3r/GUI/Notebook.cpp | 13 ++++++++++++- src/slic3r/GUI/Notebook.hpp | 14 +------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/slic3r/GUI/Notebook.cpp b/src/slic3r/GUI/Notebook.cpp index 27fb4d6d39..05c328b218 100644 --- a/src/slic3r/GUI/Notebook.cpp +++ b/src/slic3r/GUI/Notebook.cpp @@ -54,7 +54,7 @@ ButtonsListCtrl::ButtonsListCtrl(wxWindow *parent, wxBoxSizer* side_tools) : void ButtonsListCtrl::OnPaint(wxPaintEvent&) { - Slic3r::GUI::wxGetApp().UpdateDarkUI(this); + //Slic3r::GUI::wxGetApp().UpdateDarkUI(this); const wxSize sz = GetSize(); wxPaintDC dc(this); @@ -240,4 +240,15 @@ wxString ButtonsListCtrl::GetPageText(size_t n) const //#endif // _WIN32 +void Notebook::Init() +{ + // We don't need any border as we don't have anything to separate the + // page contents from. + SetInternalBorder(0); + // No effects by default. + m_showEffect = m_hideEffect = wxSHOW_EFFECT_NONE; + + m_showTimeout = m_hideTimeout = 0; + SetBackgroundStyle(wxBG_STYLE_TRANSPARENT); +} diff --git a/src/slic3r/GUI/Notebook.hpp b/src/slic3r/GUI/Notebook.hpp index acf1510565..2cd975e9b3 100644 --- a/src/slic3r/GUI/Notebook.hpp +++ b/src/slic3r/GUI/Notebook.hpp @@ -391,19 +391,7 @@ protected: } private: - void Init() - { - // We don't need any border as we don't have anything to separate the - // page contents from. - SetInternalBorder(0); - - // No effects by default. - m_showEffect = - m_hideEffect = wxSHOW_EFFECT_NONE; - - m_showTimeout = - m_hideTimeout = 0; - } + void Init(); wxShowEffect m_showEffect, m_hideEffect;