Benjamin Greiner
07f7b199d0
- disable slic3r_jobs_tests.cpp, as it fails sometimes
- PrusaSlicer-2.6.0-wxWidgets-CheckResizerFlags-assert-fix.patch
applied
- Update to version 2.6.0
* too many changes to list here, you may want to check:
https://github.com/prusa3d/PrusaSlicer/commits/version_2.6.0
* PrusaSlicer-boost1.79.patch was applied upstream: removed
* PrusaSlicer-cereal.patch was applied upstream: removed
* gentoo-887055-boost-fix.patch was applied upstream: removed
* new dependencies: nanosvg (new package), glu and glew
* more sed fiddling required for system expat and qhull support
* PrusaSlicer-2.6.0-octoprint-name-fix.patch added to work around
compile error: cast lambda expressionn to same type
* wxWidgets 3.0 is not supported anymore (even project states
otherwise). Let's hope, it will work with 3.2 better now.
upstream is using a patched 3.1 version.
OBS-URL: https://build.opensuse.org/request/show/1097058
OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=59
77 lines
3.6 KiB
Diff
77 lines
3.6 KiB
Diff
From 24a5ebd65c9d25a0fd69a3716d079fd1b00eb15c Mon Sep 17 00:00:00 2001
|
|
From: Pascal de Bruijn <pmjdebruijn@pcode.nl>
|
|
Date: Wed, 14 Jun 2023 19:56:35 +0200
|
|
Subject: [PATCH] wxWidgets: CheckResizerFlags assert fix
|
|
|
|
./src/common/sizer.cpp(2258): assert "CheckSizerFlags(!((flags) & (wxALIGN_CENTRE_VERTICAL)))"
|
|
failed in DoInsert(): wxALIGN_CENTRE_VERTICAL will be ignored in this sizer:
|
|
wxEXPAND overrides alignment flags in box sizers
|
|
---
|
|
src/slic3r/GUI/Field.cpp | 2 +-
|
|
src/slic3r/GUI/FirmwareDialog.cpp | 2 +-
|
|
src/slic3r/GUI/Tab.cpp | 4 ++--
|
|
src/slic3r/GUI/WipeTowerDialog.cpp | 2 +-
|
|
4 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp
|
|
index 74ad028d363..6789ce24cb5 100644
|
|
--- a/src/slic3r/GUI/Field.cpp
|
|
+++ b/src/slic3r/GUI/Field.cpp
|
|
@@ -1660,7 +1660,7 @@ void SliderCtrl::BUILD()
|
|
m_textctrl->SetFont(Slic3r::GUI::wxGetApp().normal_font());
|
|
m_textctrl->SetBackgroundStyle(wxBG_STYLE_PAINT);
|
|
|
|
- temp->Add(m_slider, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL, 0);
|
|
+ temp->Add(m_slider, 1, wxEXPAND, 0);
|
|
temp->Add(m_textctrl, 0, wxALIGN_CENTER_VERTICAL, 0);
|
|
|
|
m_slider->Bind(wxEVT_SLIDER, ([this](wxCommandEvent e) {
|
|
diff --git a/src/slic3r/GUI/FirmwareDialog.cpp b/src/slic3r/GUI/FirmwareDialog.cpp
|
|
index 47402644f4b..46d2fdb60d1 100644
|
|
--- a/src/slic3r/GUI/FirmwareDialog.cpp
|
|
+++ b/src/slic3r/GUI/FirmwareDialog.cpp
|
|
@@ -841,7 +841,7 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
|
|
grid->Add(port_sizer, 0, wxEXPAND);
|
|
|
|
grid->Add(label_progress, 0, wxALIGN_CENTER_VERTICAL);
|
|
- grid->Add(p->progressbar, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL);
|
|
+ grid->Add(p->progressbar, 1, wxEXPAND);
|
|
|
|
grid->Add(label_status, 0, wxALIGN_CENTER_VERTICAL);
|
|
grid->Add(p->txt_status, 0, wxEXPAND);
|
|
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
|
|
index 184b8af707f..c95fcd44219 100644
|
|
--- a/src/slic3r/GUI/Tab.cpp
|
|
+++ b/src/slic3r/GUI/Tab.cpp
|
|
@@ -217,7 +217,7 @@ void Tab::create_preset_tab()
|
|
|
|
const float scale_factor = em_unit(this)*0.1;// GetContentScaleFactor();
|
|
m_top_hsizer = new wxBoxSizer(wxHORIZONTAL);
|
|
- sizer->Add(m_top_hsizer, 0, wxEXPAND | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 3);
|
|
+ sizer->Add(m_top_hsizer, 0, wxEXPAND | wxBOTTOM, 3);
|
|
m_top_hsizer->Add(m_presets_choice, 0, wxLEFT | wxRIGHT | wxTOP | wxALIGN_CENTER_VERTICAL, 3);
|
|
m_top_hsizer->AddSpacer(int(4*scale_factor));
|
|
|
|
@@ -243,7 +243,7 @@ void Tab::create_preset_tab()
|
|
m_h_buttons_sizer->AddSpacer(int(8*scale_factor));
|
|
m_h_buttons_sizer->Add(m_btn_compare_preset, 0, wxALIGN_CENTER_VERTICAL);
|
|
|
|
- m_top_hsizer->Add(m_h_buttons_sizer, 1, wxEXPAND | wxALIGN_CENTRE_VERTICAL);
|
|
+ m_top_hsizer->Add(m_h_buttons_sizer, 1, wxEXPAND);
|
|
m_top_hsizer->AddSpacer(int(16*scale_factor));
|
|
// StretchSpacer has a strange behavior under OSX, so
|
|
// There is used just additional sizer for m_mode_sizer with right alignment
|
|
diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp
|
|
index 4d117ff8d62..6d48daa6292 100644
|
|
--- a/src/slic3r/GUI/WipeTowerDialog.cpp
|
|
+++ b/src/slic3r/GUI/WipeTowerDialog.cpp
|
|
@@ -353,7 +353,7 @@ WipingPanel::WipingPanel(wxWindow* parent, const std::vector<float>& matrix, con
|
|
hsizer->AddSpacer(10);
|
|
hsizer->Add(new wxStaticText(m_page_simple, wxID_ANY, wxString(_(L("Tool #"))) << i + 1 << ": "), 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL);
|
|
|
|
- gridsizer_simple->Add(hsizer, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL);
|
|
+ gridsizer_simple->Add(hsizer, 1, wxEXPAND);
|
|
gridsizer_simple->Add(m_old.back(),0);
|
|
gridsizer_simple->Add(m_new.back(),0);
|
|
}
|