From 38b75d1ad2c0973a808aebc548d94f9ebfc8c2fa Mon Sep 17 00:00:00 2001 From: YuSanka Date: Thu, 2 Nov 2023 12:37:00 +0100 Subject: [PATCH] Fix for #11566 - Preferences missing a scrollbar --- src/slic3r/GUI/Preferences.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index eb4dde3d1c..dc979720a6 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -74,15 +74,19 @@ PreferencesDialog::PreferencesDialog(wxWindow* parent) : build(); wxSize sz = GetSize(); - sz.x += em_unit(); + bool is_scrollbar_shown = false; const size_t pages_cnt = tabs->GetPageCount(); for (size_t tab_id = 0; tab_id < pages_cnt; tab_id++) { wxSizer* tab_sizer = tabs->GetPage(tab_id)->GetSizer(); wxScrolledWindow* scrolled = static_cast(tab_sizer->GetItem(size_t(0))->GetWindow()); scrolled->SetScrollRate(0, 5); + + is_scrollbar_shown |= scrolled->GetScrollLines(wxVERTICAL) > 0; } + if (is_scrollbar_shown) + sz.x += 2*em_unit(); SetSize(sz); m_highlighter.set_timer_owner(this, 0);