mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: not update staff pick when not shown 

Change-Id: I8145a2a365798b714fbeff188562e9879d513e3e
Jira: STUDIO-5805
This commit is contained in:
chunmao.guo 2024-01-23 11:46:12 +08:00 committed by Lane.Wei
parent 139df6a9a4
commit c81d8608dc
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/WebViewDialog.cpp
View File

@ -219,6 +219,11 @@ WebViewPanel::WebViewPanel(wxWindow *parent)
Bind(wxEVT_CLOSE_WINDOW, &WebViewPanel::OnClose, this); Bind(wxEVT_CLOSE_WINDOW, &WebViewPanel::OnClose, this);
m_LoginUpdateTimer = nullptr; m_LoginUpdateTimer = nullptr;
Bind(wxEVT_SHOW, [this](auto &e) {
if (e.IsShown() && m_has_pending_staff_pick)
SendDesignStaffpick(true);
});
} }
WebViewPanel::~WebViewPanel() WebViewPanel::~WebViewPanel()
@ -437,6 +442,10 @@ void WebViewPanel::SendRecentList(int images)
void WebViewPanel::SendDesignStaffpick(bool on) void WebViewPanel::SendDesignStaffpick(bool on)
{ {
if (on) { if (on) {
if (!IsShownOnScreen()) {
m_has_pending_staff_pick = true;
return;
}
get_design_staffpick(0, 60, [this](std::string body) { get_design_staffpick(0, 60, [this](std::string body) {
if (body.empty() || body.front() != '{') { if (body.empty() || body.front() != '{') {
BOOST_LOG_TRIVIAL(warning) << "get_design_staffpick failed " + body; BOOST_LOG_TRIVIAL(warning) << "get_design_staffpick failed " + body;
@ -453,6 +462,7 @@ void WebViewPanel::SendDesignStaffpick(bool on)
body2.insert(1, "\"command\": \"modelmall_model_advise_get\", "); body2.insert(1, "\"command\": \"modelmall_model_advise_get\", ");
RunScript(wxString::Format("window.postMessage(%s)", body2)); RunScript(wxString::Format("window.postMessage(%s)", body2));
} }
m_has_pending_staff_pick = false;
} }
void WebViewPanel::OpenModelDetail(std::string id, NetworkAgent *agent) void WebViewPanel::OpenModelDetail(std::string id, NetworkAgent *agent)

2
src/slic3r/GUI/WebViewDialog.hpp
View File

@ -153,6 +153,8 @@ private:
wxString m_javascript; wxString m_javascript;
wxString m_response_js; wxString m_response_js;
bool m_has_pending_staff_pick { false };
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };