GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-09-16 15:33:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverting of the 19b78275

Browse Source 
It looks like this workaround is no need any more after update of the wxWidgets to 3.2.0
This commit is contained in:
YuSanka 2024-05-24 13:20:31 +02:00 committed by David Kocik
parent f2e136e256
commit d2d39db33a
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/slic3r/GUI/ConfigWizard.cpp
View File

@ -72,11 +72,15 @@
#include "slic3r/GUI/I18N.hpp"
#include "slic3r/Config/Version.hpp"
/* ysFIXME - delete after testing and release
// it looks like this workaround is no need any more after update of the wxWidgets to 3.2.0
#if defined(__linux__) && defined(__WXGTK3__)
#define wxLinux_gtk3 true
#else
#define wxLinux_gtk3 false
#endif //defined(__linux__) && defined(__WXGTK3__)
*/
namespace Slic3r {
namespace GUI {
@ -551,10 +555,14 @@ ConfigWizardPage::ConfigWizardPage(ConfigWizard *parent, wxString title, wxStrin
SetSizer(sizer);
/* ysFIXME - delete after testing and release
// Update!!! -> it looks like this workaround is no need any more after update of the wxWidgets to 3.2.0
// There is strange layout on Linux with GTK3,
// see https://github.com/prusa3d/PrusaSlicer/issues/5103 and https://github.com/prusa3d/PrusaSlicer/issues/4861
// So, non-active pages will be hidden later, on wxEVT_SHOW, after completed Layout() for all pages
if (!wxLinux_gtk3)
*/
this->Hide();
Bind(wxEVT_SIZE, [this](wxSizeEvent &event) {
@ -3815,6 +3823,8 @@ ConfigWizard::ConfigWizard(wxWindow *parent)
Layout();
});
/* ysFIXME - delete after testing and release
// it looks like this workaround is no need any more after update of the wxWidgets to 3.2.0
if (wxLinux_gtk3)
this->Bind(wxEVT_SHOW, [this, vsizer](const wxShowEvent& e) {
ConfigWizardPage* active_page = p->index->active_page();
@ -3828,6 +3838,7 @@ ConfigWizard::ConfigWizard(wxWindow *parent)
// set initial dialog size
p->init_dialog_size();
});
*/
}
ConfigWizard::~ConfigWizard() {}