Re-Add libslic3r Includes After the Clipper2 2.0.1 Migration

Rebasing onto main took main's version of the files the Clipper2 migration rewrote, so their added includes are restored here, along with includes for main's new code. Clipper2's individual headers are now ignored by clang-tidy: they only build the Z variant through clipper2_z.hpp, which defines USINGZ first, so including clipper.core.h and the like directly broke ClipperZUtils.cpp.

.claude/skills/orca-wxwidgets/SKILL.md

@@ -30,9 +30,8 @@ how you read the wx docs:
 Look things up in the source the app is built from — it beats memory, and 3.3 changed real behaviour:
 
 ```bash
-WX=$(find -L deps -maxdepth 5 -type d -path '*dep_wxWidgets-prefix/src/dep_wxWidgets' 2>/dev/null | head -1)
+WX=$(find deps -maxdepth 5 -type d -path '*dep_wxWidgets-prefix/src/dep_wxWidgets' | head -1)
-# macOS: deps/build/<arch>/dep_wxWidgets-prefix/src/dep_wxWidgets   Linux, Windows: deps/<tree>/dep_wxWidgets-prefix/...
+# macOS: deps/build/<arch>/dep_wxWidgets-prefix/src/dep_wxWidgets   Linux: deps/build/dep_wxWidgets-prefix/...
-# -L follows a worktree's deps/<tree> symlinked to the main checkout. Not a glob: zsh aborts on one that matches nothing.
 # If deps are not built: git clone --depth 1 -b v3.3.2 https://github.com/SoftFever/Orca-deps-wxWidgets
 grep -n "CaptureMouse" -A 30 $WX/interface/wx/window.h      # documented contract (doxygen source)
 grep -rn "@onlyfor\|not implemented" $WX/interface/wx/popupwin.h   # documented platform limits
@@ -41,13 +40,6 @@ grep -n "IsDark" $WX/docs/changes.txt                         # what changed in
 grep -n "NotifyCaptureLost" -r $WX/src/osx $WX/src/gtk $WX/src/msw   # what each port actually does
 ```
 
-On Windows these lookups are bash: run them from Git Bash. PowerShell has no `grep`, and its `find` is
-Windows' text-search `find.exe`. To locate the wx tree from PowerShell:
-
-```powershell
-$WX = Resolve-Path deps\*\dep_wxWidgets-prefix\src\dep_wxWidgets, deps\*\*\dep_wxWidgets-prefix\src\dep_wxWidgets -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty Path
-```
-
 `interface/wx/<class>.h` is the documentation; `src/common` holds shared behaviour and
 `src/{msw,osx,gtk,unix,generic}` the per-port implementation. When the docs and the source disagree,
 the source is what runs — the references mark such facts **[source]**. Orca-side design docs live in

.claude/skills/orca-wxwidgets/references/controls-dataview.md

@@ -331,10 +331,6 @@ OrcaSlicer: integer spinners are `::SpinInput` ([below](#spininput)); progress b
 Contract:
 - A page must be created with the book as its parent and added once; the book owns and deletes it
   (`interface/wx/bookctrl.h:253-254, 273`). `RemovePage` detaches without deleting, and you then own it (`:324-330`).
-- Removing the selected page selects the page before it (the new first page if it was first) through `SetSelection`,
-  so that page is shown and PAGE_CHANGING/CHANGED are sent; removing a page before the selection only shifts the
-  index. This is `wxBookCtrlBase::DoSetSelectionAfterRemoval` (`src/common/bookctrl.cpp:477-495` **[source]**),
-  called from `DoRemovePage` by `wxSimplebook`, `wxChoicebook`, `wxListbook`, `wxToolbook` and Orca's `Notebook`.
 - `GetSelection()` inside a `PAGE_CHANGED` handler may return the old or the new page depending on the platform; use
   `event.GetSelection()` (`interface/wx/bookctrl.h:160-166`).
 - `wxSimplebook` has no UI; switch with `ChangeSelection()`. `SetSelection()` sends PAGE_CHANGING/CHANGED

.claude/skills/orca-wxwidgets/references/mouse-keyboard-focus.md

@@ -10,7 +10,7 @@ wx asserts are compiled out in Orca (`wxDEBUG_LEVEL=0`), so every misuse below t
 an assert fails silently. "GTK" means wxGTK3, Orca's Linux default (X11 and Wayland); GTK2 is only
 an opt-out build (`-DDEP_WX_GTK3=OFF`), noted where it differs. Paths starting `interface/`,
 `include/`, `src/`, `docs/` are in the wx tree
-(located as in `SKILL.md` §Ground truth); Orca paths are
+(`find deps -maxdepth 5 -type d -path '*dep_wxWidgets-prefix/src/dep_wxWidgets'`); Orca paths are
 relative to `src/slic3r/GUI/`.
 
 Contents: [Rules](#rules) · [Mouse capture](#mouse-capture) · [Mouse events](#mouse-events) ·

.claude/skills/orca-wxwidgets/references/orca-architecture.md

@@ -332,9 +332,7 @@ indices: pages come and go per printer and per feature flag.
   pages depending on the printer and on `use_printer_agents`; a removed page stays registered but is
   not prebuilt (its `LazyPage::in_book()` is false).
 - Plugin pages are appended by `PluginPages::initialize` (`plugin/host/PluginPages.hpp`) with
-  namespaced ids (`plugin.<plugin_key>.<name>`) that cannot collide with `TAB_ID_*`. Each is a
+  namespaced ids (`plugin.<plugin_key>.<name>`) that cannot collide with `TAB_ID_*`.
-  `LazyPage<PluginPage>` with order −1, destroyed when its capability goes away.
-  → [Deferred construction](#deferred-construction-lazy-lazypage-stagedbuild-idlescheduler)
 
 ### Preset tabs
 
@@ -531,32 +529,6 @@ the main frame does nothing to a panel after creating it.
   m_idle.add(m_diff_dialog);
   ```
   Cite: `IdleScheduler::tick`, `docs/HLSD/deferred-page-construction.md`.
-- **Rule:** A lazy page that can be destroyed while the main frame lives takes a negative order and
-  stays out of `m_lazy_pages`.
-  **Why:** `m_lazy_pages` and `PrebuildQueue` hold raw `LazyBase*` and nothing removes one
-  (`PrebuildQueue` has only `add` and `clear`). The queue calls `pending()` on every task each slice,
-  and `prebuild_pages_when_idle` reads every entry of `m_lazy_pages`, so a page destroyed while still
-  listed can be read after it is freed. A page only taken out of the book is fine: it stays registered
-  and its `pending()` is false (`MainFrame::show_device`).
-  ```cpp
-  // Right (PluginPages::create_page): order -1, and no m_lazy_pages.push_back
-  auto* page = new GUI::LazyPage<PluginPage>(m_parent, name, -1, [capability](wxWindow* parent) {
-      return new PluginPage(parent, capability);
-  });
-  ```
-  Cite: `PluginPages::create_page`, `PluginPages::remove_page`.
-- **Rule:** Remove several lazy pages from a book left to right.
-  **Why:** removing the selected page selects and shows the page before it
-  (`references/controls-dataview.md` §Book controls), and showing an unbuilt `LazyPage` while the frame
-  is shown builds it. In any other order the page before the selected one can be one removed next,
-  built only to be destroyed; left to right it is one that stays (unless the selected page is the
-  book's first).
-  ```cpp
-  // Right (PluginPages::shutdown): m_order is the tabs' left-to-right order
-  for (const PluginCapabilityId& id : std::vector<PluginCapabilityId>(m_order))
-      remove_page(id);
-  ```
-  Cite: `PluginPages::shutdown`, `PluginPages::relayout`, `PluginPages::on_plugin_deregister`.
 
 ## Plater and Sidebar
 

.claude/skills/orca-wxwidgets/references/painting-custom-widgets.md

@@ -6,7 +6,7 @@ to write a custom control on the wx side and how to author an Orca widget on the
 `StaticBox`/`StateHandler` foundation. Read it before writing or reviewing any `wxEVT_PAINT`
 handler, `render`/`doRender` method, `messureSize`, or a new class under `src/slic3r/GUI/Widgets/`.
 
-wx cites are relative to the pinned wx 3.3.2 tree (located as in `SKILL.md` §Ground truth).
+wx cites are relative to the pinned wx 3.3.2 tree (`deps/build/<arch>/dep_wxWidgets-prefix/src/dep_wxWidgets`).
 Orca builds wx with `wxBUILD_DEBUG_LEVEL=0` and `libslic3r_gui` with `wxDEBUG_LEVEL=0`: every
 wx assert below is compiled out and `wxCHECK*` returns silently, so paint misuse shows up only as
 wrong, missing or stale pixels, never as an assert dialog.

.claude/skills/orca-wxwidgets/references/platforms.md

@@ -78,9 +78,8 @@ Contents: [Rules](#rules) · [The wx build Orca uses](#the-wx-build-orca-uses)
   `references/colours-dark-mode.md`.
 - The checked-out source is the tree that every wx citation in this skill refers to:
   `deps/build/<arch>/dep_wxWidgets-prefix/src/dep_wxWidgets` on macOS and
-  `deps/<tree>/dep_wxWidgets-prefix/src/dep_wxWidgets` on Linux and Windows (`deps/build` for a
+  `deps/build/dep_wxWidgets-prefix/src/dep_wxWidgets` on Linux. Find it with
-  release build; `build_win.bat` names the others). Locate it with the bash or PowerShell lookup in
+  `find deps -maxdepth 5 -type d -path '*dep_wxWidgets-prefix/src/dep_wxWidgets'`. On macOS its
-  `SKILL.md` §Ground truth. On macOS its
   `src/osx/cocoa/colour.mm` already has the patch applied.
 - **Flatpak builds wx separately.** `deps/CMakeLists.txt` leaves `dep_wxWidgets` out of the deps
   target when `FLATPAK` is set. Instead, `scripts/flatpak/com.orcaslicer.OrcaSlicer.yml` has its own

.claude/skills/orca-wxwidgets/references/popups-menus.md

@@ -5,7 +5,7 @@ How wx 3.3.2 popups and menus behave on each port, and the Orca wrappers built o
 `append_menu_item`, `Plater::PopupMenu` and the macOS menubar versus `BBLTopbar`. Read it before you add
 or change anything that opens over other UI and must close by itself, or any context menu or menubar item.
 
-wx cites are relative to the wx tree root (located as in `SKILL.md` §Ground truth).
+wx cites are relative to the wx tree root (`deps/build/<arch>/dep_wxWidgets-prefix/src/dep_wxWidgets`).
 **[source]** marks behaviour derived from the implementation that the wx docs do not state or contradict.
 Orca builds wx with `wxBUILD_DEBUG_LEVEL=0`, so every "asserts" below means "fails silently in Orca".
 "GTK" means wxGTK3 (X11 and Wayland), the default Linux build; GTK2 is only an opt-out (`-DDEP_WX_GTK3=OFF`).

.claude/skills/orca-wxwidgets/references/threads-timers-app.md

@@ -7,7 +7,7 @@ yields and nested event loops, progress dialogs, startup, shutdown and exception
 screen, and the access rules for `wxGetApp()` and `app_config`. Read it whenever code runs off the
 main thread, defers work, starts a timer, yields, shows progress, or runs during startup or shutdown.
 
-wx cites are relative to the pinned wx 3.3.2 tree (located as in `SKILL.md` §Ground truth).
+wx cites are relative to the pinned wx 3.3.2 tree (`deps/build/<arch>/dep_wxWidgets-prefix/src/dep_wxWidgets`).
 Orca builds wx with `wxBUILD_DEBUG_LEVEL=0` and `libslic3r_gui` with `wxDEBUG_LEVEL=0`, so `wxASSERT`
 is compiled out and `wxCHECK*` returns silently: a timer started off the main thread never fires on macOS,
 `Exit()` on a loop that is not the active one is ignored, `Start(0)` on macOS fails — all without

.claude/skills/orca-wxwidgets/references/windows-dialogs.md

@@ -6,9 +6,10 @@ port; what Orca's `DPIDialog`/`DPIFrame` add; the Orca dialog recipe; and the `M
 Read it before writing or reviewing any dialog, frame, close handler, `Destroy()`/`delete`, or code
 that keeps a pointer to a window across an event, a `CallAfter` or a modal loop.
 
-wx cites are relative to the pinned wx 3.3.2 tree (located as in `SKILL.md` §Ground truth). wx is
+wx cites are relative to the pinned wx 3.3.2 tree (`find deps -maxdepth 5 -type d -path
-built with `wxBUILD_DEBUG_LEVEL=0` and `libslic3r_gui` with `wxDEBUG_LEVEL=0`: every wx assert
+'*dep_wxWidgets-prefix/src/dep_wxWidgets'`). wx is built with `wxBUILD_DEBUG_LEVEL=0` and
-quoted below is compiled out, so misuse fails silently (dropped call, stuck loop, freed memory), never with an assert dialog. "GTK" below
+`libslic3r_gui` with `wxDEBUG_LEVEL=0`: every wx assert quoted below is compiled out, so misuse
+fails silently (dropped call, stuck loop, freed memory), never with an assert dialog. "GTK" below
 means wxGTK as Orca builds it on Linux: GTK3 by default (X11 or Wayland); GTK2 is only an opt-out.
 
 Contents: [Rules](#rules) · [1 Creating and parenting](#1-creating-and-parenting-windows) ·

.claude/skills/orca-wxwidgets/references/wx-33-changes.md

@@ -14,7 +14,7 @@ Contents: [Rules](#rules) · [1 Reading the change logs](#1-reading-the-change-l
 [8 Migration done in Orca](#8-migration-already-done-in-orca)
 
 All `docs/`, `interface/`, `include/`, `src/`, `build/` cites are relative to the pinned wx tree
-(located as in `SKILL.md` §Ground truth), except paths
+(`find deps -maxdepth 5 -type d -path '*dep_wxWidgets-prefix/src/dep_wxWidgets'`), except paths
 explicitly called Orca's (`deps/…`, Orca's `src/CMakeLists.txt`) and bare Orca file + symbol cites.
 
 ## Rules

src/slic3r/GUI/MainFrame.hpp

@@ -184,8 +184,7 @@ class MainFrame : public DPIFrame
         std::string m_name{ "prepare_layout" };
         wxSize      m_laid_out_size;
     } m_prepare_layout_prebuild{ *this };
-    // Every built-in LazyPage, in and out of the book; prebuild_pages_when_idle() registers them.
+    // Every LazyPage, in and out of the book; prebuild_pages_when_idle() registers them.
-    // Plugin pages stay out: PluginPages destroys them at runtime.
     std::vector<LazyBase*> m_lazy_pages;
     // The latest EVT_LOAD_PRINTER_URL, applied when the web Device view is built.
     wxString              m_printer_url;

src/slic3r/GUI/PrinterWebView.cpp

@@ -119,13 +119,33 @@ PrinterWebView::PrinterWebView(wxWindow *parent)
     wxBoxSizer* topsizer = new wxBoxSizer(wxVERTICAL);
 
       // Create the webview
-    create_browser();
+    m_browser = WebView::CreateWebView(this, "");
-    m_reset_on_show = WebView::NeedsRecreateOnShow();
+    if (m_browser == nullptr) {
+        wxLogError("Could not init m_browser");
+        return;
+    }
+
+#ifdef __linux__
+    inject_vue_resize_workaround(m_browser);
+
+    auto cookiesPath = boost::filesystem::path(data_dir() + "/cache/cookies.db");
+    auto wv = static_cast<WebKitWebView*>(m_browser->GetNativeBackend());
+    auto wv_ctx = webkit_web_view_get_context(wv);
+    auto cookieManager = webkit_web_context_get_cookie_manager(wv_ctx);
+    webkit_cookie_manager_set_persistent_storage(cookieManager, cookiesPath.c_str(), WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE);
+#endif
+
+    m_browser->Bind(wxEVT_WEBVIEW_ERROR, &PrinterWebView::OnError, this);
+    m_browser->Bind(wxEVT_WEBVIEW_LOADED, &PrinterWebView::OnLoaded, this);
+    m_browser->Bind(wxEVT_WEBVIEW_NEWWINDOW, &PrinterWebView::OnNewWindow, this);
+    m_browser->Bind(wxEVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED, &PrinterWebView::OnScriptMessage, this);
 
     SetSizer(topsizer);
 
     topsizer->Add(m_browser, wxSizerFlags().Expand().Proportion(1));
 
+    update_mode();
+
     // Log backend information
     /* m_browser->GetUserAgent() may lead crash
     if (wxGetApp().get_mode() == comDevelop) {
@@ -157,44 +177,12 @@ PrinterWebView::~PrinterWebView()
     BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " End";
 }
 
-void PrinterWebView::create_browser()
-{
-    m_browser = WebView::CreateWebView(this, "");
-
-#ifdef __linux__
-    inject_vue_resize_workaround(m_browser);
-
-    auto cookiesPath = boost::filesystem::path(data_dir() + "/cache/cookies.db");
-    auto wv = static_cast<WebKitWebView*>(m_browser->GetNativeBackend());
-    auto wv_ctx = webkit_web_view_get_context(wv);
-    auto cookieManager = webkit_web_context_get_cookie_manager(wv_ctx);
-    webkit_cookie_manager_set_persistent_storage(cookieManager, cookiesPath.c_str(), WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE);
-#endif
-
-    m_browser->Bind(wxEVT_WEBVIEW_ERROR, &PrinterWebView::OnError, this);
-    m_browser->Bind(wxEVT_WEBVIEW_LOADED, &PrinterWebView::OnLoaded, this);
-    m_browser->Bind(wxEVT_WEBVIEW_NEWWINDOW, &PrinterWebView::OnNewWindow, this);
-    m_browser->Bind(wxEVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED, &PrinterWebView::OnScriptMessage, this);
-    update_mode();
-}
-
-void PrinterWebView::reset_browser()
-{
-    m_browser->Destroy(); // also removes it from the sizer
-    create_browser();
-    GetSizer()->Add(m_browser, wxSizerFlags().Expand().Proportion(1));
-    Layout();
-
-    // OnLoaded may have cleared m_url_deferred already, so requeue the last url for Show().
-    m_apikey_sent  = false;
-    m_url_deferred = m_url;
-}
-
 void PrinterWebView::load_url(wxString& url, wxString apikey)
 {
 //    this->Show();
 //    this->Raise();
-    m_url = url;
+    if (m_browser == nullptr)
+        return;
     m_apikey = apikey;
     m_apikey_sent = false;
     m_handler = create_printer_webview_handler(*this);
@@ -212,8 +200,6 @@ void PrinterWebView::load_url(wxString& url, wxString apikey)
 
 bool PrinterWebView::Show(bool show)
 {
-    if (show && std::exchange(m_reset_on_show, false))
-        reset_browser();
     if (show && !m_url_deferred.empty()) {
         m_browser->LoadURL(m_url_deferred);
         //ORCA: m_url_deferred will be cleared on load success

src/slic3r/GUI/PrinterWebView.hpp

@@ -58,18 +58,13 @@ private:
     friend class PrinterWebViewHandler;
 
     void SendAPIKey();
-    void create_browser();
-    void reset_browser();
 
     wxWebView* m_browser;
     long m_zoomFactor;
     wxString m_apikey;
     bool m_apikey_sent;
-    // Last url passed to load_url(), reloaded after reset_browser().
-    wxString m_url;
     wxString m_url_deferred;
     std::unique_ptr<PrinterWebViewHandler> m_handler;
-    bool m_reset_on_show{false};
 
     // DECLARE_EVENT_TABLE()
 };

src/slic3r/GUI/Project.cpp

@@ -80,10 +80,16 @@ ProjectPanel::ProjectPanel(wxWindow *parent, wxWindowID id, const wxPoint &pos,
 
     wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL);
 
-    create_browser();
+    m_browser = WebView::CreateWebView(this, m_project_home_url);
-    m_reset_on_show = WebView::NeedsRecreateOnShow();
+    if (m_browser == nullptr) {
+        BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format("load web view of project page failed");
+        return;
+    }
     //m_browser->Hide();
     main_sizer->Add(m_browser, wxSizerFlags().Expand().Proportion(1));
+    m_browser->Bind(wxEVT_WEBVIEW_NAVIGATED, &ProjectPanel::on_navigated, this);
+    m_browser->Bind(wxEVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED, &ProjectPanel::OnScriptMessage, this, m_browser->GetId());
+    Bind(wxEVT_WEBVIEW_NAVIGATING, &ProjectPanel::onWebNavigating, this, m_browser->GetId());
 
     Bind(EVT_PROJECT_RELOAD, &ProjectPanel::on_reload, this);
 
@@ -111,23 +117,6 @@ void ProjectPanel::shutdown()
     m_reload_task.reset();
 }
 
-void ProjectPanel::create_browser()
-{
-    m_browser = WebView::CreateWebView(this, m_project_home_url);
-    m_browser->Bind(wxEVT_WEBVIEW_NAVIGATED, &ProjectPanel::on_navigated, this);
-    m_browser->Bind(wxEVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED, &ProjectPanel::OnScriptMessage, this, m_browser->GetId());
-    m_browser->Bind(wxEVT_WEBVIEW_NAVIGATING, &ProjectPanel::onWebNavigating, this);
-}
-
-void ProjectPanel::reset_browser()
-{
-    m_browser->Destroy(); // also removes it from the sizer
-    create_browser();
-    GetSizer()->Insert(0, m_browser, wxSizerFlags().Expand().Proportion(1));
-    Layout();
-    m_web_init_completed.store(false, std::memory_order_release);
-}
-
 // Helper to convert newlines to <br>
 static std::string convert_newlines_to_br(const std::string& text) {
     std::string result = text;
@@ -292,13 +281,12 @@ void ProjectPanel::on_reload(wxCommandEvent& evt)
 
         wxString strJS = wxString::Format("HandleStudio(%s)", m_Res.dump(-1, ' ', false, json::error_handler_t::ignore));
 
-        if (!cancel_token->load(std::memory_order_acquire) && wxTheApp != nullptr && !wxGetApp().is_closing()) {
+        if (m_web_init_completed.load(std::memory_order_acquire) &&
+            !cancel_token->load(std::memory_order_acquire) && wxTheApp != nullptr && !wxGetApp().is_closing()) {
             wxGetApp().CallAfter([this, cancel_token, strJS] {
                 if (cancel_token->load(std::memory_order_acquire) || wxTheApp == nullptr || wxGetApp().is_closing())
                     return;
-                m_info_script = strJS.ToStdString();
+                RunScript(strJS.ToStdString());
-                if (m_web_init_completed.load(std::memory_order_acquire))
-                    RunScript(m_info_script);
             });
         }
     });
@@ -339,11 +327,6 @@ void ProjectPanel::OnScriptMessage(wxWebViewEvent& evt)
         }
         else if (strCmd == "request_3mf_info") {
             m_web_init_completed.store(true, std::memory_order_release);
-            // Replay the stored info after each page load.
-            CallAfter([this] {
-                if (!m_info_script.empty())
-                    RunScript(m_info_script);
-            });
         }
         else if (strCmd == "edit_project_info") {
             show_info_editor(true);
@@ -400,8 +383,6 @@ void ProjectPanel::clear_model_info()
     wxGetApp().CallAfter([this, cancel_token, strJS] {
         if (cancel_token->load(std::memory_order_acquire) || wxTheApp == nullptr || wxGetApp().is_closing())
             return;
-        // Runs after any store queued by an earlier reload pass, so stale info is never replayed.
-        m_info_script.clear();
         RunScript(strJS.ToStdString());
     });
 }
@@ -544,8 +525,6 @@ void ProjectPanel::RunScript(std::string content)
 
 bool ProjectPanel::Show(bool show) 
 {
-    if (show && std::exchange(m_reset_on_show, false))
-        reset_browser();
     if (show) update_model_data();
     return wxPanel::Show(show); 
 }

src/slic3r/GUI/Project.hpp

@@ -80,14 +80,9 @@ private:
     AuxiliaryPanel*   m_auxiliary{nullptr};
     wxString   m_project_home_url;
     wxString   m_root_dir;
-    // Last show_3mf_info script, also sent whenever the page asks for it.
-    std::string m_info_script;
-    bool       m_reset_on_show{false};
     static inline std::atomic<int> m_sequence_id{8000};
 
     void show_info_editor(bool show);
-    void create_browser();
-    void reset_browser();
     
 
 public:

src/slic3r/GUI/WebViewDialog.cpp

@@ -62,10 +62,10 @@ namespace GUI {
 WebViewPanel::WebViewPanel(wxWindow *parent)
         : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)
  {
-    m_home_url = file_url_from_path(boost::filesystem::path(resources_dir()) / "web/homepage/index.html");
+    wxString url = file_url_from_path(boost::filesystem::path(resources_dir()) / "web/homepage/index.html");
     wxString strlang = wxGetApp().current_language_code_safe();
     if (strlang != "")
-        m_home_url += "?lang=" + strlang;
+        url += "?lang=" + strlang;
 
     wxBoxSizer* topsizer = new wxBoxSizer(wxVERTICAL);
     
@@ -109,8 +109,12 @@ WebViewPanel::WebViewPanel(wxWindow *parent)
     m_info = new wxInfoBar(this);
     topsizer->Add(m_info, wxSizerFlags().Expand());
     // Create the webview
-    create_browser();
+    m_browser = WebView::CreateWebView(this, url);
-    m_reset_on_show = WebView::NeedsRecreateOnShow();
+    if (m_browser == nullptr) {
+        wxLogError("Could not init m_browser");
+        return;
+    }
+    m_browser->Hide();
     SetSizer(topsizer);
 
     topsizer->Add(m_browser, wxSizerFlags().Expand().Proportion(1));
@@ -260,27 +264,6 @@ WebViewPanel::~WebViewPanel()
 }
 
 
-void WebViewPanel::create_browser()
-{
-    m_browser = WebView::CreateWebView(this, m_home_url);
-    m_browser->Hide();
-}
-
-void WebViewPanel::reset_browser()
-{
-    m_browser->Destroy(); // also removes it from the sizer
-    create_browser();
-    GetSizer()->Add(m_browser, wxSizerFlags().Expand().Proportion(1));
-    Layout();
-}
-
-bool WebViewPanel::Show(bool show)
-{
-    if (show && std::exchange(m_reset_on_show, false))
-        reset_browser();
-    return wxPanel::Show(show);
-}
-
 void WebViewPanel::load_url(wxString& url)
 {
     this->Show();

src/slic3r/GUI/WebViewDialog.hpp

@@ -113,15 +113,9 @@ public:
     int  get_model_mall_detail_url(std::string *url, std::string id);
 
     void update_mode();
-
-    bool Show(bool show = true) override;
 private:
-    void create_browser();
-    void reset_browser();
 
     wxWebView* m_browser;
-    wxString m_home_url;
-    bool m_reset_on_show{false};
     wxButton *  m_button_stop;
     wxTextCtrl *m_url;
 #if !BBL_RELEASE_TO_PUBLIC

src/slic3r/GUI/Widgets/WebView.cpp

@@ -381,17 +381,6 @@ void WebView::MarkScriptMessageHandlerAdded(wxWebView * webView)
     if (WebViewRef *ref = webview_ref(webView))
         ref->m_script_handler_added = true;
 }
-
-bool WebView::NeedsRecreateOnShow()
-{
-    const bool recreating = Slic3r::GUI::wxGetApp().is_recreating_gui();
-    BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": is_recreating_gui = " << recreating;
-#ifdef __WIN32__
-    return recreating;
-#else
-    return false;
-#endif
-}
 #if wxUSE_WEBVIEW_EDGE
 bool WebView::CheckWebViewRuntime()
 {

src/slic3r/GUI/Widgets/WebView.hpp

@@ -23,10 +23,6 @@ public:
     // Marks "wx" as registered so CreateWebView's deferred add skips the duplicate.
     static void MarkScriptMessageHandlerAdded(wxWebView * webView);
 
-    // On Windows, a WebView2 backend created during a GUI rebuild (language switch) can come up
-    // ignoring every navigation. A panel that gets true here recreates its view on first Show().
-    static bool NeedsRecreateOnShow();
-
     static void RecreateAll();
 };
 

src/slic3r/plugin/host/PluginPages.cpp

@@ -1,7 +1,6 @@
 #include "PluginPages.hpp"
 
 #include "libslic3r/AppConfig.hpp"
-#include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/Notebook.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/Widgets/Button.hpp"
@@ -184,10 +183,8 @@ void PluginPages::initialize(Notebook* parent)
 
 void PluginPages::shutdown()
 {
-    // Removing the selected tab selects the tab to its left. In tab order that is a built-in tab,
+    while (!m_pages.empty())
-    // never an unbuilt plugin page that is removed next and would be built only to be destroyed.
+        remove_page(m_pages.begin()->first);
-    for (const PluginCapabilityId& id : std::vector<PluginCapabilityId>(m_order))
-        remove_page(id);
     m_parent = nullptr;
 }
 
@@ -228,7 +225,8 @@ bool PluginPages::create_page(const PluginCapabilityId& id)
         BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << " Failed to get icon for plugin " << id.plugin_key;
     }
 
-    wxBitmap bitmap;
+    auto* page = new PluginPage(m_parent, std::move(capability));
+
     if (!icon.empty()) {
         try {
             boost::filesystem::path icon_path(icon);
@@ -236,7 +234,7 @@ bool PluginPages::create_page(const PluginCapabilityId& id)
             if (extension == ".svg" || extension == ".png")
                 icon_path.replace_extension();
 
-            bitmap = create_scaled_bitmap(icon_path.string(), m_parent, 20);
+            page->set_icon(create_scaled_bitmap(icon_path.string(), m_parent, 20));
         } catch (const std::exception& error) {
             BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << " Failed to load icon for plugin " << id.plugin_key << ": " << error.what();
         } catch (...) {
@@ -244,15 +242,7 @@ bool PluginPages::create_page(const PluginCapabilityId& id)
         }
     }
 
-    // Built the first time its tab is shown, so a language switch never creates the page's browser
+    m_pages.emplace(id, page);
-    // while the main window is being rebuilt. Never prebuilt: the idle queue cannot drop a page
-    // that remove_page() destroys.
-    auto* page = new GUI::LazyPage<PluginPage>(m_parent, GUI::into_u8(page_tab_id(id)), -1,
-                                               [capability = std::move(capability)](wxWindow* parent) {
-                                                   return new PluginPage(parent, capability);
-                                               });
-
-    m_pages.emplace(id, Page{page, bitmap});
     m_order.push_back(id);
     return true;
 }
@@ -281,10 +271,16 @@ void PluginPages::on_plugin_register(const std::string& plugin_key)
 
 void PluginPages::on_plugin_deregister(const std::string& plugin_key)
 {
-    // In tab order, as in shutdown().
+    for (auto it = m_pages.begin(); it != m_pages.end();) {
-    for (const PluginCapabilityId& id : std::vector<PluginCapabilityId>(m_order))
+        if (it->first.plugin_key != plugin_key) {
-        if (id.plugin_key == plugin_key)
+            ++it;
-            remove_page(id);
+            continue;
+        }
+
+        const PluginCapabilityId id = it->first;
+        ++it;
+        remove_page(id);
+    }
 }
 
 void PluginPages::remove_page(const PluginCapabilityId& id)
@@ -293,10 +289,8 @@ void PluginPages::remove_page(const PluginCapabilityId& id)
     if (it == m_pages.end())
         return;
 
-    GUI::LazyPage<PluginPage>* page = it->second.page;
+    PluginPage* page = it->second;
-    // Only a built page has installed a message sender on the capability.
+    page->detach_capability();
-    if (PluginPage* built = page->get())
-        built->detach_capability();
 
     m_pages.erase(it);
     m_order.erase(std::remove(m_order.begin(), m_order.end(), id), m_order.end());
@@ -354,27 +348,26 @@ void PluginPages::relayout()
     bool up_to_date = page_count >= tab_ids.size();
     for (size_t i = 0; up_to_date && i < tab_ids.size(); ++i)
         up_to_date = m_parent->GetPageName(page_count - tab_ids.size() + i) == page_tab_id(tab_ids[i]);
-    for (const auto& [id, entry] : m_pages) {
+    for (const auto& [id, page] : m_pages) {
         if (!up_to_date)
             break;
         const bool wanted = std::find(tab_ids.begin(), tab_ids.end(), id) != tab_ids.end();
-        up_to_date = entry.page->in_book() == wanted;
+        up_to_date = (m_parent->FindPage(page) != wxNOT_FOUND) == wanted;
     }
 
     if (!up_to_date) {
         const wxString id_to_reselect = m_parent->GetSelectedPageName();
 
-        // In tab order, as in shutdown().
+        for (const auto& [id, page] : m_pages) {
-        for (const auto& id : m_order) {
+            const int idx = m_parent->FindPage(page);
-            const int idx = m_parent->FindPage(m_pages.at(id).page);
             if (idx != wxNOT_FOUND)
                 m_parent->RemovePage(idx);
         }
 
         for (const auto& id : tab_ids) {
-            const Page& entry = m_pages.at(id);
+            PluginPage* page = m_pages.at(id);
-            m_parent->InsertPage(m_parent->GetPageCount(), page_tab_id(id), entry.page, wxString::FromUTF8(id.name), "",
+            m_parent->InsertPage(m_parent->GetPageCount(), page_tab_id(id), page, wxString::FromUTF8(id.name), "",
-                                 false, entry.icon);
+                                 false, page->icon());
         }
 
         if (!id_to_reselect.empty())

src/slic3r/plugin/host/PluginPages.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <slic3r/GUI/LazyPage.hpp>
 #include <slic3r/GUI/WebPanel.hpp>
 #include <slic3r/plugin/PythonPluginInterface.hpp>
 #include <slic3r/plugin/pluginTypes/pages/PagesPluginCapability.hpp>
@@ -30,6 +29,8 @@ public:
 
     void detach_capability();
     void push_message(const std::string& message);
+    void set_icon(const wxBitmap& icon) { m_icon = icon; }
+    const wxBitmap& icon() const { return m_icon; }
 
 protected:
     std::optional<std::string> page_html() override;
@@ -40,6 +41,7 @@ private:
 
     std::shared_ptr<PagesPluginCapability> m_cap;
     std::shared_ptr<std::atomic<PluginPage*>> m_lifetime;
+    wxBitmap m_icon;
 };
 
 class PluginPages
@@ -71,13 +73,7 @@ private:
     void show_overflow_menu();
     static wxString page_tab_id(const PluginCapabilityId& id);
 
-    struct Page
+    std::map<PluginCapabilityId, PluginPage*> m_pages;
-    {
-        GUI::LazyPage<PluginPage>* page{nullptr};
-        wxBitmap                   icon;
-    };
-
-    std::map<PluginCapabilityId, Page> m_pages;
     std::vector<PluginCapabilityId> m_order;
     Notebook* m_parent{nullptr};