From 1ae9bd9d4aea002eab8c7925207d5ae873429345 Mon Sep 17 00:00:00 2001 From: "zorro.zhang" Date: Wed, 20 Mar 2024 18:04:45 +0800 Subject: [PATCH] FIX: Image Scale Mode and Online Display JIRA: none Change-Id: I528f16e93b82748d86dc93e2dd3d85f317babaa7 --- resources/web/homepage2/css/online.css | 1 + resources/web/homepage2/css/recent.css | 3 ++- src/slic3r/GUI/WebViewDialog.cpp | 11 +++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/resources/web/homepage2/css/online.css b/resources/web/homepage2/css/online.css index 1a5ac6bda..cfed7f41c 100644 --- a/resources/web/homepage2/css/online.css +++ b/resources/web/homepage2/css/online.css @@ -78,6 +78,7 @@ border-radius: 8px; width: 100%; aspect-ratio: 4/3; + object-fit: cover; } .HotModel_Designer_Info diff --git a/resources/web/homepage2/css/recent.css b/resources/web/homepage2/css/recent.css index c468322a6..1e3729e21 100644 --- a/resources/web/homepage2/css/recent.css +++ b/resources/web/homepage2/css/recent.css @@ -153,7 +153,8 @@ { border-radius: 8px; width: 100%; - aspect-ratio: 4/3; + aspect-ratio: 4/3; + object-fit: cover; } .FileName diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index 9983e57bf..0c287ec4a 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -606,8 +606,6 @@ void WebViewPanel::SendMakerlabList( ) BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": parse got exception: " << e.what(); return; } - - m_has_pending_staff_pick = false; } //void WebViewPanel::OpenModelDetail(std::string id, NetworkAgent *agent) @@ -1233,12 +1231,13 @@ void WebViewPanel::OnError(wxWebViewEvent& evt) 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() + ")'"); - //Show the info bar with an error - m_info->ShowMessage(_L("An error occurred loading ") + evt.GetURL() + "\n" + - "'" + category + "'", wxICON_ERROR); + // Show the info bar with an error + m_info->ShowMessage(_L("An error occurred loading ") + evt.GetURL() + "\n" + "'" + category + "'", wxICON_ERROR); + } if (evt.GetInt() == wxWEBVIEW_NAV_ERR_CONNECTION && evt.GetId() == m_browserMW->GetId()) {