Merge branch 'main' into perf/slicing-optimizations

.github/workflows/build_all.yml

@@ -7,6 +7,7 @@ on:
      - release/*
     paths:
      - 'deps/**'
+     - 'deps_src/**'
      - 'src/**'
      - '**/CMakeLists.txt'
      - 'version.inc'
@@ -14,8 +15,10 @@ on:
      - 'resources/**'
      - ".github/workflows/build_*.yml"
      - ".github/workflows/unit_tests*.yml"
+     - 'build_linux.sh'
      - 'build_win.bat'
      - 'scripts/test_build_win.ps1'
+     - 'build_release_macos.sh'
      - 'scripts/build_preset_cache.*'
      - 'scripts/flatpak/**'
      - 'scripts/msix/**'
@@ -54,7 +57,9 @@ on:
         default: false
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref }}
+  # cancel_closed_pr_builds.yml joins this group by name, so update that file
+  # with any change here.
+  group: build-all-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref }}
   # Pushes don't cancel a running build, because only a finished branch build
   # saves caches every pull request can restore.
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}

.github/workflows/cancel_closed_pr_builds.yml

@@ -0,0 +1,21 @@
+name: Cancel builds of closed pull requests
+
+on:
+  # pull_request_target needs no approval for first-time contributors and must never
+  # check out pull request code.
+  pull_request_target:
+    types:
+      - closed
+
+permissions: {}
+
+jobs:
+  cancel:
+    # Matches the concurrency group in build_all.yml, so joining it cancels the pull
+    # request's unfinished Build all run.
+    concurrency:
+      group: build-all-pull_request-${{ github.event.pull_request.number }}
+      cancel-in-progress: true
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "Joined concurrency group build-all-pull_request-${{ github.event.pull_request.number }}."

src/slic3r/GUI/ConfigWizard.cpp

@@ -81,6 +81,7 @@
 #include "MsgDialog.hpp"
 #include "UnsavedChangesDialog.hpp"
 #include "MainFrame.hpp"
+#include "Plater.hpp"
 
 namespace fs = boost::filesystem;
 
@@ -2813,6 +2814,8 @@ bool ConfigWizard::run(RunReason reason, StartPage start_page)
 
         app.app_config->set_legacy_datadir(false);
         app.update_mode();
+        if (Plater *plater = app.plater())
+            plater->normalize_bed_types(false);
         // BBS
         //app.obj_manipul()->update_ui_from_settings();
         BOOST_LOG_TRIVIAL(info) << "ConfigWizard applied";

src/slic3r/GUI/ParamsDialog.cpp

@@ -77,11 +77,8 @@ ParamsDialog::ParamsDialog(wxWindow * parent)
             auto &preset_bundle = *wxGetApp().preset_bundle;
             const bool supports_multiple_bed_types = preset_bundle.is_bbl_vendor() ||
                 preset_bundle.printers.get_edited_preset().config.opt_bool("support_multi_bed_types");
-            if (m_initial_multi_bed_types != supports_multiple_bed_types) {
+            if (m_initial_multi_bed_types != supports_multiple_bed_types)
                 wxGetApp().plater()->normalize_bed_types(true);
-                if (auto *plate_tab = dynamic_cast<TabPrintPlate *>(wxGetApp().get_plate_tab()))
-                    plate_tab->update_model_config();
-            }
         }
 
         if (!m_editing_filament_id.empty()) {
@@ -93,8 +90,6 @@ ParamsDialog::ParamsDialog(wxWindow * parent)
 #endif
         wxGetApp().sidebar().finish_param_edit();
     });
-
-    //wxGetApp().UpdateDlgDarkUI(this);
 }
 
 void ParamsDialog::Popup()

src/slic3r/GUI/Plater.cpp

@@ -15609,7 +15609,7 @@ void Plater::reset_project_dirty_initial_presets() { p->reset_project_dirty_init
 void Plater::render_project_state_debug_window() const { p->render_project_state_debug_window(); }
 #endif // ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW
 
-void Plater::normalize_bed_types(bool printer_setting_changed)
+void Plater::normalize_bed_types(bool multi_bed_changed)
 {
     if (only_gcode_mode() || is_gcode_3mf())
         return;
@@ -15635,7 +15635,7 @@ void Plater::normalize_bed_types(bool printer_setting_changed)
     }
 
     // Refresh the controls after a capability change, even when no override was reset.
-    if (printer_setting_changed || overrides_reset) {
+    if (multi_bed_changed || overrides_reset) {
         sidebar().update_all_preset_comboboxes();
         wxGetApp().obj_list()->update_and_show_object_settings_item();
     }