diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index a1f2b72c1a..6cea75fb71 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -1618,19 +1618,11 @@ wxBoxSizer *StatusBasePanel::create_monitoring_page() m_custom_camera_view = WebView::CreateWebView(this, wxEmptyString); m_custom_camera_view->EnableContextMenu(false); - Bind(wxEVT_WEBVIEW_NAVIGATING, &StatusBasePanel::on_webview_navigating, this, m_custom_camera_view->GetId()); m_web_media_controller = std::make_unique(m_custom_camera_view); m_media_play_ctrl = new MediaPlayCtrl(this, m_media_ctrl, wxDefaultPosition, wxSize(-1, FromDIP(40))); m_media_play_ctrl->SetWebMediaController(m_web_media_controller.get()); m_custom_camera_view->Hide(); - // m_custom_camera_view->Bind(wxEVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED, [this](wxWebViewEvent& evt) { - // if (evt.GetString() == "leavepictureinpicture") { - // // When leaving PiP, video gets paused in some cases and toggling play - // // programmatically does not work. - // m_custom_camera_view->Reload(); - // } - // }); sizer->Add(m_media_ctrl, 1, wxEXPAND | wxALL, 0); sizer->Add(m_custom_camera_view, 1, wxEXPAND | wxALL, 0); @@ -1643,12 +1635,6 @@ wxBoxSizer *StatusBasePanel::create_monitoring_page() return sizer; } -void StatusBasePanel::on_webview_navigating(wxWebViewEvent& evt) { - wxGetApp().CallAfter([this] { - remove_controls(); - }); -} - wxBoxSizer *StatusBasePanel::create_machine_control_page(wxWindow *parent) { wxBoxSizer *bSizer_right = new wxBoxSizer(wxVERTICAL); @@ -5121,23 +5107,6 @@ void StatusPanel::on_camera_enter(wxMouseEvent& event) } } -void StatusBasePanel::remove_controls() -{ - const std::string js_cleanup_video_element = R"( - document.body.style.overflow='hidden'; - const video = document.querySelector('video'); - video.setAttribute('style', 'width: 100% !important;'); - video.removeAttribute('controls'); - video.addEventListener('leavepictureinpicture', () => { - window.wx.postMessage('leavepictureinpicture'); - }); - video.addEventListener('enterpictureinpicture', () => { - window.wx.postMessage('enterpictureinpicture'); - }); - )"; - m_custom_camera_view->RunScript(js_cleanup_video_element); -} - void StatusPanel::on_camera_leave(wxMouseEvent& event) { if (obj && m_camera_popup) { diff --git a/src/slic3r/GUI/StatusPanel.hpp b/src/slic3r/GUI/StatusPanel.hpp index 9f7547ecf1..4a17aff571 100644 --- a/src/slic3r/GUI/StatusPanel.hpp +++ b/src/slic3r/GUI/StatusPanel.hpp @@ -606,8 +606,6 @@ protected: virtual void on_axis_ctrl_e_up_10(wxCommandEvent &event) { event.Skip(); } virtual void on_axis_ctrl_e_down_10(wxCommandEvent &event) { event.Skip(); } virtual void on_nozzle_selected(wxCommandEvent &event) { event.Skip(); } - void remove_controls(); - void on_webview_navigating(wxWebViewEvent& evt); public: StatusBasePanel(wxWindow * parent,