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

FIX: Image Scale Mode and Online Display 

JIRA: none
Change-Id: I528f16e93b82748d86dc93e2dd3d85f317babaa7
This commit is contained in:
zorro.zhang 2024-03-20 18:04:45 +08:00 committed by Lane.Wei
parent ee39d775f0
commit 1ae9bd9d4a
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/web/homepage2/css/online.css
View File

@ -78,6 +78,7 @@
border-radius: 8px; border-radius: 8px;
width: 100%; width: 100%;
aspect-ratio: 4/3; aspect-ratio: 4/3;
object-fit: cover;
} }
.HotModel_Designer_Info .HotModel_Designer_Info

1
resources/web/homepage2/css/recent.css
View File

@ -154,6 +154,7 @@
border-radius: 8px; border-radius: 8px;
width: 100%; width: 100%;
aspect-ratio: 4/3; aspect-ratio: 4/3;
object-fit: cover;
} }
.FileName .FileName

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

@ -606,8 +606,6 @@ void WebViewPanel::SendMakerlabList( )
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": parse got exception: " << e.what(); BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": parse got exception: " << e.what();
return; return;
} }
m_has_pending_staff_pick = false;
} }
//void WebViewPanel::OpenModelDetail(std::string id, NetworkAgent *agent) //void WebViewPanel::OpenModelDetail(std::string id, NetworkAgent *agent)
@ -1234,11 +1232,12 @@ void WebViewPanel::OnError(wxWebViewEvent& evt)
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": [" << category << "] " << evt.GetString().ToUTF8().data(); BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": [" << category << "] " << evt.GetString().ToUTF8().data();
if (wxGetApp().get_mode() == comDevelop) if (wxGetApp().get_mode() == comDevelop)
{
wxLogMessage("%s", "Error; url='" + evt.GetURL() + "', error='" + category + " (" + evt.GetString() + ")'"); wxLogMessage("%s", "Error; url='" + evt.GetURL() + "', error='" + category + " (" + evt.GetString() + ")'");
//Show the info bar with an error // Show the info bar with an error
m_info->ShowMessage(_L("An error occurred loading ") + evt.GetURL() + "\n" + m_info->ShowMessage(_L("An error occurred loading ") + evt.GetURL() + "\n" + "'" + category + "'", wxICON_ERROR);
"'" + category + "'", wxICON_ERROR); }
if (evt.GetInt() == wxWEBVIEW_NAV_ERR_CONNECTION && evt.GetId() == m_browserMW->GetId()) if (evt.GetInt() == wxWEBVIEW_NAV_ERR_CONNECTION && evt.GetId() == m_browserMW->GetId())
{ {