diff --git a/src/slic3r/GUI/CalibrationPanel.cpp b/src/slic3r/GUI/CalibrationPanel.cpp index 745cf22058..3f959b9735 100644 --- a/src/slic3r/GUI/CalibrationPanel.cpp +++ b/src/slic3r/GUI/CalibrationPanel.cpp @@ -486,6 +486,9 @@ void CalibrationPanel::init_tabpanel() { for (int i = 0; i < (int)CALI_MODE_COUNT; i++) m_tabpanel->SetPageImage(i, ""); + auto padding_size = m_tabpanel->GetBtnsListCtrl()->GetPaddingSize(0); + m_tabpanel->GetBtnsListCtrl()->SetPaddingSize({ FromDIP(15), padding_size.y }); + m_initialized = true; } diff --git a/src/slic3r/GUI/CalibrationWizardPage.cpp b/src/slic3r/GUI/CalibrationWizardPage.cpp index be1b25c98e..ce94502eac 100644 --- a/src/slic3r/GUI/CalibrationWizardPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPage.cpp @@ -169,7 +169,7 @@ CaliPageButton::CaliPageButton(wxWindow* parent, CaliPageActionType type, wxStri this->SetLabel(_L("Manage Result")); break; case CaliPageActionType::CALI_ACTION_MANUAL_CALI: - this->SetLabel(_L("Maual Calibration")); + this->SetLabel(_L("Manual Calibration")); this->SetToolTip(_L("Result can be read by human eyes.")); break; case CaliPageActionType::CALI_ACTION_AUTO_CALI: diff --git a/src/slic3r/GUI/TabButton.cpp b/src/slic3r/GUI/TabButton.cpp index 3540dc656a..74e8177c56 100644 --- a/src/slic3r/GUI/TabButton.cpp +++ b/src/slic3r/GUI/TabButton.cpp @@ -71,6 +71,11 @@ void TabButton::SetPaddingSize(const wxSize &size) messureSize(); } +const wxSize& TabButton::GetPaddingSize() +{ + return paddingSize; +} + void TabButton::SetTextColor(StateColor const &color) { text_color = color; diff --git a/src/slic3r/GUI/TabButton.hpp b/src/slic3r/GUI/TabButton.hpp index e64722d637..8eb060b206 100644 --- a/src/slic3r/GUI/TabButton.hpp +++ b/src/slic3r/GUI/TabButton.hpp @@ -27,6 +27,8 @@ public: void SetMinSize(const wxSize& size) override; void SetPaddingSize(const wxSize& size); + + const wxSize& GetPaddingSize(); void SetTextColor(StateColor const &color); diff --git a/src/slic3r/GUI/Tabbook.cpp b/src/slic3r/GUI/Tabbook.cpp index 8b41e8aec2..d1feb92655 100644 --- a/src/slic3r/GUI/Tabbook.cpp +++ b/src/slic3r/GUI/Tabbook.cpp @@ -176,6 +176,16 @@ wxString TabButtonsListCtrl::GetPageText(size_t n) const return btn->GetLabel(); } +const wxSize& TabButtonsListCtrl::GetPaddingSize(size_t n) { + return m_pageButtons[n]->GetPaddingSize(); +} + +void TabButtonsListCtrl::SetPaddingSize(const wxSize& size) { + for (auto& btn : m_pageButtons) { + btn->SetPaddingSize(size); + } +} + //#endif // _WIN32 diff --git a/src/slic3r/GUI/Tabbook.hpp b/src/slic3r/GUI/Tabbook.hpp index 67339c08ee..476354dd88 100644 --- a/src/slic3r/GUI/Tabbook.hpp +++ b/src/slic3r/GUI/Tabbook.hpp @@ -29,6 +29,8 @@ public: bool SetPageImage(size_t n, const std::string& bmp_name); void SetPageText(size_t n, const wxString& strText); wxString GetPageText(size_t n) const; + const wxSize& GetPaddingSize(size_t n); + void SetPaddingSize(const wxSize& size); private: wxWindow* m_parent;