mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-23 17:02:39 +00:00
HanifKoh
2876374b45
orca.host.ui.create_dock_panel(html, title, width, height, on_message, on_close, dock) hosts plugin HTML in a pane of the Plater's dock manager, next to the sidebar, and returns a UiDockPanel handle (post/show/hide/close/is_open). The arguments follow create_window(). The panel uses the window.orca bridge of plugin windows, restores its position and size from the saved window layout, hides with the Plater off the Prepare and Preview tabs when floating, and is closed with its plugin; plugin panes are removed in MainFrame::shutdown(). The web view hosting moves out of PluginPage into a shared WebPanel base: bootstrap page and swap to the plugin HTML, theme, element-default and bridge scripts, window.orca message parsing, delivery to the page, and live re-theming, also re-applied on every load after the swap. Pages tabs and docked panels both derive from it. Pages tabs now re-theme in place on a theme change instead of being reloaded, and a window.orca call a host does not support is logged. What the hosts share no longer lives in one of them: the bootstrap page, the base URL and the plugin-window bridge move to Widgets/WebHosting, used by WebDialog and WebPanel alike. The Plater restores plugin panes with a new saved-layout parser, GUI/AuiPaneLayout, kept in its own small header so slic3rutils can test it without pulling in the Plater. The web hosting classes carry no plugin name, so other hosts can reuse them: PluginWebDialog becomes WebDialog (its bootstrap page moves to resources/web/dialog/WebDialog), and destroy_for_plugin(), load_plugin_content() and plugin_defaults_user_script() become destroy_silently(), load_page_html() and element_defaults_user_script(). Includes a sample plugin (sandboxes/orca_dock_panel_plugin_any.py) and binding and layout-helper tests in slic3rutils.
90 lines
3.6 KiB
C++
90 lines
3.6 KiB
C++
#ifndef slic3r_GUI_WebDialog_hpp_
|
|
#define slic3r_GUI_WebDialog_hpp_
|
|
|
|
#include "Widgets/WebViewHostDialog.hpp"
|
|
|
|
#include <functional>
|
|
#include <optional>
|
|
#include <string>
|
|
|
|
#include <nlohmann/json.hpp>
|
|
#include <wx/webview.h>
|
|
|
|
namespace Slic3r { namespace GUI {
|
|
|
|
// A host-owned webview window that renders plugin-supplied raw HTML and bridges
|
|
// messages to/from the page through a small injected `window.orca` API.
|
|
//
|
|
// This class is deliberately Python-agnostic: it talks to the plugin layer only
|
|
// through std::function hooks. Those hooks must NOT capture bare pybind11
|
|
// objects, because the dialog can be destroyed on the main thread without the
|
|
// GIL held; the plugin layer wraps any Python callables in a GIL-safe holder.
|
|
//
|
|
// Usable both modally (ShowModal -> read result()) and modelessly (Show()).
|
|
class WebDialog : public Slic3r::GUI::WebViewHostDialog
|
|
{
|
|
public:
|
|
using MessageHandler = std::function<void(const nlohmann::json& data)>;
|
|
using SubmitHandler = std::function<void(const nlohmann::json& data)>;
|
|
using CloseHandler = std::function<void()>;
|
|
|
|
// on_submit fires once for window.orca.submit(). on_close fires only on a
|
|
// user/JS-initiated close (while the window is alive). on_destroyed runs from
|
|
// the destructor on every path and must touch host-side state only (no Python
|
|
// / no derived members).
|
|
WebDialog(wxWindow* parent,
|
|
const wxString& title,
|
|
const std::string& html,
|
|
const wxSize& size,
|
|
MessageHandler on_message,
|
|
SubmitHandler on_submit,
|
|
CloseHandler on_close,
|
|
CloseHandler on_destroyed,
|
|
long wx_style = wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX | wxMAXIMIZE_BOX | wxRESIZE_BORDER);
|
|
~WebDialog() override;
|
|
|
|
static void post_message(WebDialog* dialog, const nlohmann::json& data);
|
|
static void request_close(WebDialog* dialog);
|
|
static void destroy_silently(WebDialog* dialog);
|
|
|
|
// Push a payload to the page; delivered to handlers registered via
|
|
// window.orca.onMessage(). MAIN-THREAD ONLY (the plugin layer marshals).
|
|
void push_message(const nlohmann::json& data);
|
|
|
|
bool is_open() const { return m_open; }
|
|
|
|
// The payload submitted via window.orca.submit() (modal use), if any.
|
|
const std::optional<nlohmann::json>& result() const { return m_result; }
|
|
|
|
protected:
|
|
void on_script_message(const nlohmann::json& payload) override;
|
|
// Plugin HTML is loaded as a raw string, not a localized resource URL.
|
|
bool append_language_to_url() const override { return false; }
|
|
void add_user_scripts() override;
|
|
|
|
private:
|
|
void on_bootstrap_event(wxWebViewEvent& event);
|
|
void on_navigated(wxWebViewEvent& event);
|
|
void load_page_html();
|
|
void on_close_window(wxCloseEvent& event);
|
|
void fire_submit(const nlohmann::json& data);
|
|
void fire_close();
|
|
void finish(bool submitted, const nlohmann::json& data);
|
|
|
|
std::string m_html;
|
|
bool m_content_loaded{false};
|
|
bool m_own_page_load{false}; // a SetPage of the plugin HTML is in flight
|
|
bool m_content_navigated{false}; // a navigation to the base URL has committed
|
|
bool m_open{true};
|
|
bool m_close_fired{false};
|
|
std::optional<nlohmann::json> m_result;
|
|
MessageHandler m_on_message;
|
|
SubmitHandler m_on_submit;
|
|
CloseHandler m_on_close;
|
|
CloseHandler m_on_destroyed;
|
|
};
|
|
|
|
}} // namespace Slic3r::GUI
|
|
|
|
#endif // slic3r_GUI_WebDialog_hpp_
|